@taquito/michelson-encoder 12.1.0 → 13.0.0

package/dist/lib/schema/parameter.js

@@ -49,15 +49,15 @@ class ParameterSchema {
             throw new error_1.ParameterEncodingError('Unable to encode parameter', args.toString(), ex);
         }
     }
-    EncodeObject(_value) {
+    EncodeObject(value, semantics) {
         try {
-            return this.root.EncodeObject(_value);
+            return this.root.EncodeObject(value, semantics);
         }
         catch (ex) {
             if (ex instanceof token_1.TokenValidationError) {
                 throw ex;
             }
-            throw new error_1.ParameterEncodingError('Unable to encode parameter object', _value, ex);
+            throw new error_1.ParameterEncodingError('Unable to encode parameter object', value, ex);
         }
     }
     /**

package/dist/lib/schema/parameter.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../../src/schema/parameter.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,2CAAwE;AACxE,qCAAuC;AACvC,6CAA+C;AAG/C,mCAA0E;AAE1E;;GAEG;AACH,MAAa,eAAe;IA+B1B,YAAY,GAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,yBAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IA9BD,MAAM,CAAC,eAAe,CAAC,GAA+B;QACpD,MAAM,SAAS,GACb,GAAG;YACH,GAAG,CAAC,MAAM;YACV,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAmC,CAAC;QAC9F,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAChD,MAAM,IAAI,+BAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,CACL,IAAI,CAAC,IAAI,YAAY,YAAO;YAC5B,CAAC,IAAI,CAAC,IAAI,YAAY,oBAAW,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,YAAO,CAAC,CAC9E,CAAC;IACJ,CAAC;IAED,IAAI,aAAa;QACf,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;SACrD;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAMD,OAAO,CAAC,GAAQ,EAAE,SAAoB;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,IAAW;QACnB,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY,4BAAoB,EAAE;gBACtC,MAAM,EAAE,CAAC;aACV;YAED,MAAM,IAAI,8BAAsB,CAAC,4BAA4B,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;SACrF;IACH,CAAC;IAED,YAAY,CAAC,MAAY;QACvB,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACvC;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY,4BAAoB,EAAE;gBACtC,MAAM,EAAE,CAAC;aACV;YAED,MAAM,IAAI,8BAAsB,CAAC,mCAAmC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;SACnF;IACH,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;IACpC,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACtC,CAAC;CACF;AAjFD,0CAiFC"}
+{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../../src/schema/parameter.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,2CAA0F;AAC1F,qCAAuC;AACvC,6CAA+C;AAG/C,mCAA0E;AAE1E;;GAEG;AACH,MAAa,eAAe;IA+B1B,YAAY,GAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,yBAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IA9BD,MAAM,CAAC,eAAe,CAAC,GAA+B;QACpD,MAAM,SAAS,GACb,GAAG;YACH,GAAG,CAAC,MAAM;YACV,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAmC,CAAC;QAC9F,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAChD,MAAM,IAAI,+BAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,CACL,IAAI,CAAC,IAAI,YAAY,YAAO;YAC5B,CAAC,IAAI,CAAC,IAAI,YAAY,oBAAW,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,YAAO,CAAC,CAC9E,CAAC;IACJ,CAAC;IAED,IAAI,aAAa;QACf,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;SACrD;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAMD,OAAO,CAAC,GAAQ,EAAE,SAAoB;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,IAAW;QACnB,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY,4BAAoB,EAAE;gBACtC,MAAM,EAAE,CAAC;aACV;YAED,MAAM,IAAI,8BAAsB,CAAC,4BAA4B,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;SACrF;IACH,CAAC;IAED,YAAY,CAAC,KAAW,EAAE,SAA4B;QACpD,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SACjD;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY,4BAAoB,EAAE;gBACtC,MAAM,EAAE,CAAC;aACV;YAED,MAAM,IAAI,8BAAsB,CAAC,mCAAmC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;SAClF;IACH,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;IACpC,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACtC,CAAC;CACF;AAjFD,0CAiFC"}

package/dist/lib/schema/storage.js

@@ -18,16 +18,17 @@ function collapse(val, prim = pair_1.PairToken.prim) {
             args: val,
         }, prim);
     }
-    if (val.prim === prim && val.args && val.args.length > 2) {
-        return Object.assign(Object.assign({}, val), { args: [
-                (_b = val.args) === null || _b === void 0 ? void 0 : _b[0],
+    const extended = val;
+    if (extended.prim === prim && extended.args && extended.args.length > 2) {
+        return Object.assign(Object.assign({}, extended), { args: [
+                (_b = extended.args) === null || _b === void 0 ? void 0 : _b[0],
                 {
                     prim: prim,
-                    args: (_c = val.args) === null || _c === void 0 ? void 0 : _c.slice(1),
+                    args: (_c = extended.args) === null || _c === void 0 ? void 0 : _c.slice(1),
                 },
             ] });
     }
-    return val;
+    return extended;
 }
 function deepEqual(a, b) {
     const ac = collapse(a);
@@ -37,7 +38,7 @@ function deepEqual(a, b) {
             (ac.args !== undefined &&
                 bc.args !== undefined &&
                 ac.args.length === bc.args.length &&
-                ac.args.every((v, i) => { var _b; return deepEqual(v, (_b = bc.args) === null || _b === void 0 ? void 0 : _b[i]); }))) &&
+                ac.args.every((v, i) => { var _b, _c; return deepEqual(v, (_c = (_b = bc.args) === null || _b === void 0 ? void 0 : _b[i]) !== null && _c !== void 0 ? _c : {}); }))) &&
         ((ac.annots === undefined && bc.annots === undefined) ||
             (ac.annots !== undefined &&
                 bc.annots !== undefined &&
@@ -69,7 +70,21 @@ class Schema {
         const storage = val &&
             val.script &&
             Array.isArray(val.script.code) &&
-            val.script.code.find((x) => x.prim === 'storage');
+            val.script.code.find((x) => {
+                if (!Array.isArray(x)) {
+                    const checkExtended = x;
+                    if (checkExtended.prim) {
+                        return checkExtended.prim === 'storage';
+                    }
+                    else {
+                        return false;
+                    }
+                }
+                else {
+                    // storage passed along as original storage value
+                    this.fromRPCResponse({ script: { code: x, storage: val.script.storage } });
+                }
+            });
         if (!storage || !Array.isArray(storage.args)) {
             throw new error_1.InvalidRpcResponseError(val.script);
         }
@@ -130,9 +145,9 @@ class Schema {
             throw new error_1.BigMapEncodingError('big map key', ex);
         }
     }
-    Encode(_value) {
+    Encode(value, semantics) {
         try {
-            return this.root.EncodeObject(_value);
+            return this.root.EncodeObject(value, semantics);
         }
         catch (ex) {
             if (ex instanceof token_1.TokenValidationError) {
@@ -179,18 +194,22 @@ class Schema {
     FindFirstInTopLevelPair(storage, valueType) {
         return this.findValue(this.root['val'], storage, valueType);
     }
+    // TODO check these type casts
     findValue(schema, storage, valueToFind) {
         if (deepEqual(valueToFind, schema)) {
             return storage;
         }
-        if (Array.isArray(schema) || schema['prim'] === 'pair') {
+        if (Array.isArray(schema) || schema.prim === 'pair') {
             const sch = collapse(schema);
-            const str = collapse(storage, 'Pair');
-            if (sch.args === undefined || str.args === undefined) {
+            const strg = collapse(storage, 'Pair');
+            if (sch.args === undefined || strg.args === undefined) {
                 throw new error_1.MissingArgumentError('Tokens have no arguments'); // unlikely
             }
-            return (this.findValue(sch.args[0], str.args[0], valueToFind) ||
-                this.findValue(sch.args[1], str.args[1], valueToFind));
+            if (sch.args[0])
+                return (
+                // unsafe
+                this.findValue(sch.args[0], strg.args[0], valueToFind) ||
+                    this.findValue(sch.args[1], strg.args[1], valueToFind));
         }
     }
     /**

package/dist/lib/schema/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/schema/storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/schema/storage.ts"],"names":[],"mappings":"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"}

package/dist/lib/tokens/bigmap.js

@@ -71,12 +71,15 @@ class BigMapToken extends token_1.Token {
             };
         });
     }
-    EncodeObject(args) {
+    EncodeObject(args, semantic) {
         const val = args;
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[BigMapToken.prim]) {
+            return semantic[BigMapToken.prim](val, this.val);
+        }
         return Array.from(val.keys())
             .sort((a, b) => this.KeySchema.compare(a, b))
             .map((key) => {

package/dist/lib/tokens/bigmap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bigmap.js","sourceRoot":"","sources":["../../../src/tokens/bigmap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bigmap.js","sourceRoot":"","sources":["../../../src/tokens/bigmap.ts"],"names":[],"mappings":"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"}

package/dist/lib/tokens/bls12-381-fr.js

@@ -43,7 +43,10 @@ class Bls12381frToken extends token_1.Token {
             return { bytes: val };
         }
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
+        if (semantic && semantic[Bls12381frToken.prim]) {
+            return semantic[Bls12381frToken.prim](val);
+        }
         if (typeof val === 'number') {
             return { int: val.toString() };
         }

package/dist/lib/tokens/bls12-381-fr.js.map

@@ -1 +1 @@
-{"version":3,"file":"bls12-381-fr.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-fr.ts"],"names":[],"mappings":";;;AACA,mCAAoE;AAEpE,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;SAChC;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC;aACX;YACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SACvB;IACH,CAAC;IAED,YAAY,CAAC,GAAiC;QAC5C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;SAChC;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC;aACX;YACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SACvB;IACH,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5EH,0CA6EC;AA5EC,8CAA8C;AAC9C,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}
+{"version":3,"file":"bls12-381-fr.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-fr.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;SAChC;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC;aACX;YACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SACvB;IACH,CAAC;IAED,YAAY,CAAC,GAAiC,EAAE,QAA2B;QACzE,IAAI,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAO,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC5C;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;SAChC;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC;aACX;YACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SACvB;IACH,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA/EH,0CAgFC;AA/EC,8CAA8C;AAC9C,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}

package/dist/lib/tokens/bls12-381-g1.js

@@ -38,12 +38,15 @@ class Bls12381g1Token extends token_1.Token {
         }
         return { bytes: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         val = this.convertUint8ArrayToHexString(val);
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[Bls12381g1Token.prim]) {
+            return semantic[Bls12381g1Token.prim](val);
+        }
         return { bytes: val };
     }
     Execute(val) {

package/dist/lib/tokens/bls12-381-g1.js.map

@@ -1 +1 @@
-{"version":3,"file":"bls12-381-g1.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-g1.ts"],"names":[],"mappings":";;;AACA,mCAAoE;AAEpE,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB;QACnC,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AApEH,0CAqEC;AApEC,oCAAoC;AACpC,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}
+{"version":3,"file":"bls12-381-g1.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-g1.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB,EAAE,QAA2B;QAChE,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAO,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC5C;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAvEH,0CAwEC;AAvEC,oCAAoC;AACpC,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}

package/dist/lib/tokens/bls12-381-g2.js

@@ -38,12 +38,15 @@ class Bls12381g2Token extends token_1.Token {
         }
         return { bytes: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         val = this.convertUint8ArrayToHexString(val);
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[Bls12381g2Token.prim]) {
+            return semantic[Bls12381g2Token.prim](val);
+        }
         return { bytes: val };
     }
     Execute(val) {

package/dist/lib/tokens/bls12-381-g2.js.map

@@ -1 +1 @@
-{"version":3,"file":"bls12-381-g2.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-g2.ts"],"names":[],"mappings":";;;AACA,mCAAoE;AAEpE,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB;QACnC,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AApEH,0CAqEC;AApEC,oCAAoC;AACpC,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}
+{"version":3,"file":"bls12-381-g2.js","sourceRoot":"","sources":["../../../src/tokens/bls12-381-g2.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,yBAA0B,SAAQ,4BAAoB;IAEjE,YAAmB,KAAU,EAAS,KAAsB,EAAE,OAAe;QAC3E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAiB;QAD5D,SAAI,GAAG,2BAA2B,CAAC;IAGnC,CAAC;CACF;AALD,8DAKC;AACD,MAAa,eAAgB,SAAQ,aAAK;IAKxC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB,EAAE,QAA2B;QAChE,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAO,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC5C;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,eAAe,CAAC,IAAI;YACrC,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAvEH,0CAwEC;AAvEC,oCAAoC;AACpC,qEAAqE;AAC9D,oBAAI,GAAmB,cAAc,CAAC"}

package/dist/lib/tokens/chain-id.js

@@ -49,11 +49,14 @@ class ChainIDToken extends token_1.ComparableToken {
         }
         return { string: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[ChainIDToken.prim]) {
+            return semantic[ChainIDToken.prim](val);
+        }
         return { string: val };
     }
     ToKey({ string }) {

package/dist/lib/tokens/chain-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"chain-id.js","sourceRoot":"","sources":["../../../src/tokens/chain-id.ts"],"names":[],"mappings":";;;AAAA,mCAAqF;AACrF,0CAAiE;AAGjE,MAAa,sBAAuB,SAAQ,4BAAoB;IAE9D,YAAmB,KAAU,EAAS,KAAmB,EAAE,OAAe;QACxE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAc;QADzD,SAAI,GAAG,wBAAwB,CAAC;IAGhC,CAAC;CACF;AALD,wDAKC;AAED,MAAa,YAAa,SAAQ,uBAAe;IAG/C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,KAAU;QACxB,IAAI,qBAAa,CAAC,KAAK,CAAC,KAAK,wBAAgB,CAAC,KAAK,EAAE;YACnD,OAAO,IAAI,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;SACxE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,YAAY,CAAC,IAAI;YAClC,MAAM,EAAE,YAAY,CAAC,IAAI;SAC1B,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAO;QAC1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA1EH,oCA2EC;AA1EQ,iBAAI,GAAe,UAAU,CAAC"}
+{"version":3,"file":"chain-id.js","sourceRoot":"","sources":["../../../src/tokens/chain-id.ts"],"names":[],"mappings":";;;AAAA,mCAMiB;AACjB,0CAAiE;AAGjE,MAAa,sBAAuB,SAAQ,4BAAoB;IAE9D,YAAmB,KAAU,EAAS,KAAmB,EAAE,OAAe;QACxE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAc;QADzD,SAAI,GAAG,wBAAwB,CAAC;IAGhC,CAAC;CACF;AALD,wDAKC;AAED,MAAa,YAAa,SAAQ,uBAAe;IAG/C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,KAAU;QACxB,IAAI,qBAAa,CAAC,KAAK,CAAC,KAAK,wBAAgB,CAAC,KAAK,EAAE;YACnD,OAAO,IAAI,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;SACxE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,YAAY,CAAC,IAAI;YAClC,MAAM,EAAE,YAAY,CAAC,IAAI;SAC1B,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC3C,OAAO,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACzC;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAO;QAC1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA9EH,oCA+EC;AA9EQ,iBAAI,GAAe,UAAU,CAAC"}

package/dist/lib/tokens/chest-key.js

@@ -38,12 +38,15 @@ class ChestKeyToken extends token_1.Token {
         }
         return { bytes: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         val = this.convertUint8ArrayToHexString(val);
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[ChestKeyToken.prim]) {
+            return semantic[ChestKeyToken.prim](val);
+        }
         return { bytes: val };
     }
     Execute(val) {

package/dist/lib/tokens/chest-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"chest-key.js","sourceRoot":"","sources":["../../../src/tokens/chest-key.ts"],"names":[],"mappings":";;;AACA,mCAAoE;AAEpE,MAAa,uBAAwB,SAAQ,4BAAoB;IAE/D,YAAmB,KAAU,EAAS,KAAoB,EAAE,OAAe;QACzE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAe;QAD1D,SAAI,GAAG,yBAAyB,CAAC;IAGjC,CAAC;CACF;AALD,0DAKC;AACD,MAAa,aAAc,SAAQ,aAAK;IAGtC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,uBAAuB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB;QACnC,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,aAAa,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,aAAa,CAAC,IAAI;YACnC,MAAM,EAAE,aAAa,CAAC,IAAI;SAC3B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,aAAa,CAAC,IAAI,KAAK,WAAW,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAlEH,sCAmEC;AAlEQ,kBAAI,GAAgB,WAAW,CAAC"}
+{"version":3,"file":"chest-key.js","sourceRoot":"","sources":["../../../src/tokens/chest-key.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,uBAAwB,SAAQ,4BAAoB;IAE/D,YAAmB,KAAU,EAAS,KAAoB,EAAE,OAAe;QACzE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAe;QAD1D,SAAI,GAAG,yBAAyB,CAAC;IAGjC,CAAC;CACF;AALD,0DAKC;AACD,MAAa,aAAc,SAAQ,aAAK;IAGtC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,uBAAuB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB,EAAE,QAA2B;QAChE,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC5C,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC1C;QAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,aAAa,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,aAAa,CAAC,IAAI;YACnC,MAAM,EAAE,aAAa,CAAC,IAAI;SAC3B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,aAAa,CAAC,IAAI,KAAK,WAAW,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAvEH,sCAwEC;AAvEQ,kBAAI,GAAgB,WAAW,CAAC"}

package/dist/lib/tokens/chest.js

@@ -38,12 +38,15 @@ class ChestToken extends token_1.Token {
         }
         return { bytes: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         val = this.convertUint8ArrayToHexString(val);
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[ChestToken.prim]) {
+            return semantic[ChestToken.prim](val);
+        }
         return { bytes: val };
     }
     Execute(val) {

package/dist/lib/tokens/chest.js.map

@@ -1 +1 @@
-{"version":3,"file":"chest.js","sourceRoot":"","sources":["../../../src/tokens/chest.ts"],"names":[],"mappings":";;;AACA,mCAAoE;AAEpE,MAAa,oBAAqB,SAAQ,4BAAoB;IAE5D,YAAmB,KAAU,EAAS,KAAiB,EAAE,OAAe;QACtE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAY;QADvD,SAAI,GAAG,sBAAsB,CAAC;IAG9B,CAAC;CACF;AALD,oDAKC;AACD,MAAa,UAAW,SAAQ,aAAK;IAGnC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB;QACnC,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,IAAI;YAChC,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAlEH,gCAmEC;AAlEQ,eAAI,GAAY,OAAO,CAAC"}
+{"version":3,"file":"chest.js","sourceRoot":"","sources":["../../../src/tokens/chest.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,oBAAqB,SAAQ,4BAAoB;IAE5D,YAAmB,KAAU,EAAS,KAAiB,EAAE,OAAe;QACtE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAY;QADvD,SAAI,GAAG,sBAAsB,CAAC;IAG9B,CAAC;CACF;AALD,oDAKC;AACD,MAAa,UAAW,SAAQ,aAAK;IAGnC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACtD,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAW;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,GAAwB,EAAE,QAA2B;QAChE,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACvC;QAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,IAAI;YAChC,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAvEH,gCAwEC;AAvEQ,eAAI,GAAY,OAAO,CAAC"}

package/dist/lib/tokens/comparable/address.js

@@ -40,17 +40,23 @@ class AddressToken extends token_1.ComparableToken {
         }
         return { string: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[AddressToken.prim]) {
+            return semantic[AddressToken.prim](val);
+        }
         return { string: val };
     }
     Execute(val) {
         if (val.string) {
             return val.string;
         }
+        if (!val.bytes) {
+            throw new AddressValidationError(val, this, `cannot be missing both string and bytes: ${val}`);
+        }
         return utils_1.encodePubKey(val.bytes);
     }
     /**
@@ -70,24 +76,24 @@ class AddressToken extends token_1.ComparableToken {
         if (string) {
             return string;
         }
+        if (!bytes) {
+            throw new AddressValidationError({ bytes, string }, this, `cannot be missing both string and bytes ${{ string, bytes }}`);
+        }
         return utils_1.encodePubKey(bytes);
     }
     compare(address1, address2) {
         const isImplicit = (address) => {
             return address.startsWith('tz');
         };
-        if (isImplicit(address1) && isImplicit(address2)) {
-            return super.compare(address1, address2);
-        }
-        else if (isImplicit(address1)) {
+        const implicit1 = isImplicit(address1);
+        const implicit2 = isImplicit(address2);
+        if (implicit1 && !implicit2) {
             return -1;
         }
-        else if (isImplicit(address2)) {
+        else if (implicit2 && !implicit1) {
             return 1;
         }
-        else {
-            return super.compare(address1, address2);
-        }
+        return super.compare(address1, address2);
     }
     findAndReturnTokens(tokenToFind, tokens) {
         if (AddressToken.prim === tokenToFind) {

package/dist/lib/tokens/comparable/address.js.map

@@ -1 +1 @@
-{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/address.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/address.ts"],"names":[],"mappings":"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"}

package/dist/lib/tokens/comparable/bool.js

@@ -16,7 +16,10 @@ class BoolToken extends token_1.ComparableToken {
         const val = args.pop();
         return { prim: val ? 'True' : 'False' };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
+        if (semantic && semantic[BoolToken.prim]) {
+            return semantic[BoolToken.prim](val);
+        }
         return { prim: val ? 'True' : 'False' };
     }
     /**

package/dist/lib/tokens/comparable/bool.js.map

@@ -1 +1 @@
-{"version":3,"file":"bool.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/bool.ts"],"names":[],"mappings":";;;AACA,oCAAgE;AAEhE,MAAa,SAAU,SAAQ,uBAAe;IAG5C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAEM,YAAY,CAAC,GAAQ;QAC1B,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,SAAS,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,SAAS,CAAC,IAAI;YAC/B,MAAM,EAAE,SAAS,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;YAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE;SAC/B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAW;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,IAAS,EAAE,IAAS;QAC1B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,CAAC,CAAC;SACV;aAAM,IAAI,IAAI,EAAE;YACf,OAAO,CAAC,CAAC;SACV;aAAM;YACL,OAAO,CAAC,CAAC,CAAC;SACX;IACH,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE;YAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAjEH,8BAkEC;AAjEQ,cAAI,GAAW,MAAM,CAAC"}
+{"version":3,"file":"bool.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/bool.ts"],"names":[],"mappings":";;;AACA,oCAAkF;AAElF,MAAa,SAAU,SAAQ,uBAAe;IAG5C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACxC,OAAO,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACtC;QACD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,SAAS,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,SAAS,CAAC,IAAI;YAC/B,MAAM,EAAE,SAAS,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAQ;YAClC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE;SAC/B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAW;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,IAAS,EAAE,IAAS;QAC1B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,CAAC,CAAC;SACV;aAAM,IAAI,IAAI,EAAE;YACf,OAAO,CAAC,CAAC;SACV;aAAM;YACL,OAAO,CAAC,CAAC,CAAC;SACX;IACH,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE;YAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AApEH,8BAqEC;AApEQ,cAAI,GAAW,MAAM,CAAC"}

package/dist/lib/tokens/comparable/bytes.js

@@ -44,12 +44,15 @@ class BytesToken extends token_1.ComparableToken {
         }
         return { bytes: String(val).toString() };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         val = this.convertUint8ArrayToHexString(val);
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[BytesToken.prim]) {
+            return semantic[BytesToken.prim](val);
+        }
         return { bytes: String(val).toString() };
     }
     Execute(val) {

package/dist/lib/tokens/comparable/bytes.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/bytes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/bytes.ts"],"names":[],"mappings":";;;AACA,oCAMkB;AAElB,MAAa,oBAAqB,SAAQ,4BAAoB;IAE5D,YAAmB,KAAU,EAAS,KAAiB,EAAE,OAAe;QACtE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAY;QADvD,SAAI,GAAG,sBAAsB,CAAC;IAG9B,CAAC;CACF;AALD,oDAKC;AAED,MAAa,UAAW,SAAQ,uBAAe;IAG7C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACnB,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE;SAChC,CAAC;IACJ,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACjF,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,4BAA4B,CAAC,GAAQ;QAC3C,OAAO,GAAG,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjF,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAErB,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC3C,CAAC;IAEM,YAAY,CAAC,GAAwB,EAAE,QAA2B;QACvE,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACvC;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC3C,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,IAAI;YAChC,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAO;QACjC,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC;SACf;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAxFH,gCAyFC;AAxFQ,eAAI,GAAY,OAAO,CAAC"}

package/dist/lib/tokens/comparable/int.js

@@ -52,11 +52,14 @@ class IntToken extends token_1.ComparableToken {
         }
         return { int: new bignumber_js_1.default(val).toFixed() };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[IntToken.prim]) {
+            return semantic[IntToken.prim](val);
+        }
         return { int: new bignumber_js_1.default(val).toFixed() };
     }
     ToBigMapKey(val) {

package/dist/lib/tokens/comparable/int.js.map

@@ -1 +1 @@
-{"version":3,"file":"int.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/int.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"int.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/int.ts"],"names":[],"mappings":"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"}

package/dist/lib/tokens/comparable/key_hash.js

@@ -39,11 +39,14 @@ class KeyHashToken extends token_1.ComparableToken {
         }
         return { string: val };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[KeyHashToken.prim]) {
+            return semantic[KeyHashToken.prim](val);
+        }
         return { string: val };
     }
     /**

package/dist/lib/tokens/comparable/key_hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"key_hash.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/key_hash.ts"],"names":[],"mappings":";;;AAAA,oCAAsF;AACtF,0CAAkF;AAGlF,MAAa,sBAAuB,SAAQ,4BAAoB;IAE9D,YAAmB,KAAU,EAAS,KAAmB,EAAE,OAAe;QACxE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAc;QADzD,SAAI,GAAG,wBAAwB,CAAC;IAGhC,CAAC;CACF;AALD,wDAKC;AAED,MAAa,YAAa,SAAQ,uBAAe;IAG/C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAsC;QACnD,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAC;SACnB;QAED,OAAO,qBAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAEO,OAAO,CAAC,KAAU;QACxB,IAAI,uBAAe,CAAC,KAAK,CAAC,KAAK,wBAAgB,CAAC,KAAK,EAAE;YACrD,OAAO,IAAI,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAyB,KAAK,EAAE,CAAC,CAAC;SAClF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,YAAY,CAAC,IAAI;YAClC,MAAM,EAAE,YAAY,CAAC,IAAI;SAC1B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAO;QACjC,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC;SACf;QAED,OAAO,qBAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAlFH,oCAmFC;AAlFQ,iBAAI,GAAe,UAAU,CAAC"}
+{"version":3,"file":"key_hash.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/key_hash.ts"],"names":[],"mappings":";;;AAAA,oCAMkB;AAClB,0CAAkF;AAGlF,MAAa,sBAAuB,SAAQ,4BAAoB;IAE9D,YAAmB,KAAU,EAAS,KAAmB,EAAE,OAAe;QACxE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAc;QADzD,SAAI,GAAG,wBAAwB,CAAC;IAGhC,CAAC;CACF;AALD,wDAKC;AAED,MAAa,YAAa,SAAQ,uBAAe;IAG/C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAsC;QACnD,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAC;SACnB;QAED,OAAO,qBAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAEO,OAAO,CAAC,KAAU;QACxB,IAAI,uBAAe,CAAC,KAAK,CAAC,KAAK,wBAAgB,CAAC,KAAK,EAAE;YACrD,OAAO,IAAI,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAyB,KAAK,EAAE,CAAC,CAAC;SAClF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC3C,OAAO,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACzC;QAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,YAAY,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,YAAY,CAAC,IAAI;YAClC,MAAM,EAAE,YAAY,CAAC,IAAI;SAC1B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAO;QACjC,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC;SACf;QAED,OAAO,qBAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAtFH,oCAuFC;AAtFQ,iBAAI,GAAe,UAAU,CAAC"}

package/dist/lib/tokens/comparable/mutez.js

@@ -52,11 +52,14 @@ class MutezToken extends token_1.ComparableToken {
         }
         return { int: String(val).toString() };
     }
-    EncodeObject(val) {
+    EncodeObject(val, semantic) {
         const err = this.isValid(val);
         if (err) {
             throw err;
         }
+        if (semantic && semantic[MutezToken.prim]) {
+            return semantic[MutezToken.prim](val);
+        }
         return { int: String(val).toString() };
     }
     ToBigMapKey(val) {

package/dist/lib/tokens/comparable/mutez.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutez.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/mutez.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mutez.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/mutez.ts"],"names":[],"mappings":"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"}