@taquito/michelson-encoder 23.0.2 → 23.1.0

package/dist/lib/constants.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SaplingStateValue = exports.UnitValue = void 0;
+/**
+ * Symbol representing Unit value in Michelson
+ */
+exports.UnitValue = Symbol();
+/**
+ * Sapling state placeholder value
+ */
+exports.SaplingStateValue = {};

package/dist/lib/michelson-map.js

@@ -102,35 +102,29 @@ class MichelsonMap {
         if (!this.keySchema) {
             return;
         }
-        this.keySchema.Typecheck(key);
+        if (!this.keySchema.Typecheck(key)) {
+            throw new MapTypecheckError(key, this.keySchema, 'key', 'Type validation failed');
+        }
     }
     typecheckValue(value) {
         if (!this.valueSchema) {
             return;
         }
-        this.valueSchema.Typecheck(value);
+        if (!this.valueSchema.Typecheck(value)) {
+            throw new MapTypecheckError(value, this.valueSchema, 'value', 'Type validation failed');
+        }
     }
     /**
      * @throws {@link MapTypecheckError} when the argument passed does not match the expected schema for value
      */
     assertTypecheckValue(value) {
-        try {
-            this.typecheckValue(value);
-        }
-        catch (e) {
-            throw new MapTypecheckError(value, this.valueSchema, 'value', e);
-        }
+        this.typecheckValue(value);
     }
     /**
      * @throws {@link MapTypecheckError} when the argument passed does not match the expected schema for key
      */
     assertTypecheckKey(key) {
-        try {
-            this.typecheckKey(key);
-        }
-        catch (e) {
-            throw new MapTypecheckError(key, this.keySchema, 'key', e);
-        }
+        this.typecheckKey(key);
     }
     serializeDeterministically(key) {
         return (0, fast_json_stable_stringify_1.default)(key);

package/dist/lib/schema/parameter.js

@@ -49,7 +49,7 @@ class ParameterSchema {
      */
     get hasAnnotation() {
         if (this.isMultipleEntryPoint) {
-            return Object.keys(this.ExtractSchema())[0] !== '0';
+            return Object.keys(this.generateSchema())[0] !== '0';
         }
         else {
             return true;
@@ -100,13 +100,6 @@ class ParameterSchema {
             throw new errors_1.ParameterEncodingError('Unable to encode parameter object', this.root, value, ex);
         }
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return this.root.ExtractSchema();
-    }
     /**
      * @description Produce a schema grouping together all the entry points of a contract.
      */

package/dist/lib/schema/storage.js

@@ -112,20 +112,33 @@ class Schema {
         const storage = this.root.Execute(val, semantics);
         return this.removeTopLevelAnnotation(storage);
     }
+    /**
+     * @description Validates that a value matches the schema type.
+     * Performs type checking with special handling for BigMap, Ticket, and nested Map tokens.
+     *
+     * @param val - The value to validate against the schema
+     * @returns Returns true if validation passes, false if validation fails
+     */
     Typecheck(val) {
         if (this.root instanceof bigmap_1.BigMapToken && Number.isInteger(Number(val))) {
-            return;
+            return true;
         }
         if (this.root instanceof ticket_1.TicketToken && val.ticketer && val.value && val.amount) {
-            return;
+            return true;
         }
         if (this.root instanceof ticket_deprecated_1.TicketDeprecatedToken && val.ticketer && val.value && val.amount) {
-            return;
+            return true;
         }
         if (this.root instanceof map_1.MapToken && this.root.ValueSchema instanceof bigmap_1.BigMapToken) {
-            return;
+            return true;
+        }
+        try {
+            this.root.EncodeObject(val);
+            return true;
+        }
+        catch (error) {
+            return false;
         }
-        this.root.EncodeObject(val);
     }
     /**
      * @throws {@link InvalidBigMapSchemaError}
@@ -180,13 +193,6 @@ class Schema {
             throw new errors_1.StorageEncodingError('storage object', ex, this.root, value, semantics);
         }
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return this.removeTopLevelAnnotation(this.root.ExtractSchema());
-    }
     /**
      * @description Produce a representation of the storage schema.
      * Note: Provide guidance on how to write the storage object for the origination operation with Taquito.
@@ -194,19 +200,6 @@ class Schema {
     generateSchema() {
         return this.removeTopLevelAnnotation(this.root.generateSchema());
     }
-    /**
-     * @deprecated
-     * @throws {@link InvalidBigMapSchemaError}
-     */
-    ComputeState(tx, state) {
-        if (!this.bigMap) {
-            throw new errors_1.InvalidBigMapSchemaError('Big map schema is undefined');
-        }
-        const bigMap = tx.reduce((prev, current) => {
-            return Object.assign(Object.assign({}, prev), this.ExecuteOnBigMapDiff(current.contents[0].metadata.operation_result.big_map_diff));
-        }, {});
-        return Object.assign(Object.assign({}, this.Execute(state)), { [this.bigMap.annot()]: bigMap });
-    }
     /**
      * @description Look up in top-level pairs of the storage to find a value matching the specified type
      *

package/dist/lib/schema/view-schema.js

@@ -77,14 +77,14 @@ class ViewSchema {
      * @description Return the signature of the view parameter
      */
     extractArgsSchema() {
-        return this.rootArgsType.ExtractSchema();
+        return this.rootArgsType.generateSchema();
     }
     /**
      *
      * @description Return the format of the view result
      */
     extractResultSchema() {
-        return this.rootReturnType.ExtractSchema();
+        return this.rootReturnType.generateSchema();
     }
 }
 exports.ViewSchema = ViewSchema;

package/dist/lib/taquito-michelson-encoder.js

@@ -26,8 +26,9 @@ __exportStar(require("./schema/event-schema"), exports);
 __exportStar(require("./schema/errors"), exports);
 __exportStar(require("./schema/types"), exports);
 __exportStar(require("./errors"), exports);
-exports.UnitValue = Symbol();
-exports.SaplingStateValue = {};
+var constants_1 = require("./constants");
+Object.defineProperty(exports, "UnitValue", { enumerable: true, get: function () { return constants_1.UnitValue; } });
+Object.defineProperty(exports, "SaplingStateValue", { enumerable: true, get: function () { return constants_1.SaplingStateValue; } });
 __exportStar(require("./michelson-map"), exports);
 var version_1 = require("./version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });

package/dist/lib/tokens/bigmap.js

@@ -29,18 +29,6 @@ class BigMapToken extends token_1.Token {
     get KeySchema() {
         return this.createToken(this.val.args[0], 0);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            big_map: {
-                key: this.KeySchema.ExtractSchema(),
-                value: this.ValueSchema.ExtractSchema(),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: BigMapToken.prim,

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

@@ -67,13 +67,6 @@ class Bls12381frToken extends token_1.Token {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return Bls12381frToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: Bls12381frToken.prim,

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

@@ -57,13 +57,6 @@ class Bls12381g1Token extends token_1.Token {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return Bls12381g1Token.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: Bls12381g1Token.prim,

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

@@ -57,13 +57,6 @@ class Bls12381g2Token extends token_1.Token {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return Bls12381g2Token.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: Bls12381g2Token.prim,

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

@@ -34,13 +34,6 @@ class ChainIDToken extends token_1.ComparableToken {
     Execute(val) {
         return val[Object.keys(val)[0]];
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return ChainIDToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: ChainIDToken.prim,

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

@@ -57,13 +57,6 @@ class ChestKeyToken extends token_1.Token {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return ChestKeyToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: ChestKeyToken.prim,

package/dist/lib/tokens/chest.js

@@ -57,13 +57,6 @@ class ChestToken extends token_1.Token {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return ChestToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: ChestToken.prim,

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

@@ -71,13 +71,6 @@ class AddressToken extends token_1.ComparableToken {
         }
         return (0, utils_1.encodeAddress)(val.bytes);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return AddressToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: AddressToken.prim,

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

@@ -22,13 +22,6 @@ class BoolToken extends token_1.ComparableToken {
         }
         return { prim: val ? 'True' : 'False' };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return BoolToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: BoolToken.prim,

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

@@ -67,13 +67,6 @@ class BytesToken extends token_1.ComparableToken {
     Execute(val) {
         return val.bytes;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return BytesToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: BytesToken.prim,

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

@@ -26,13 +26,6 @@ class IntToken extends token_1.ComparableToken {
     Execute(val) {
         return new bignumber_js_1.default(val[Object.keys(val)[0]]);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return IntToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: IntToken.prim,

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

@@ -55,13 +55,6 @@ class KeyHashToken extends token_1.ComparableToken {
         }
         return { string: val };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return KeyHashToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: KeyHashToken.prim,

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

@@ -26,13 +26,6 @@ class MutezToken extends token_1.ComparableToken {
     Execute(val) {
         return new bignumber_js_1.default(val[Object.keys(val)[0]]);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return MutezToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: MutezToken.prim,

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

@@ -56,13 +56,6 @@ class NatToken extends token_1.ComparableToken {
         }
         return { int: new bignumber_js_1.default(val).toFixed() };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return NatToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: NatToken.prim,

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

@@ -12,13 +12,6 @@ class StringToken extends token_1.ComparableToken {
     Execute(val) {
         return val[Object.keys(val)[0]];
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return StringToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: StringToken.prim,

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

@@ -40,13 +40,6 @@ class TimestampToken extends token_1.ComparableToken {
             return { string: val };
         }
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return TimestampToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: TimestampToken.prim,

package/dist/lib/tokens/constant.js

@@ -61,13 +61,6 @@ class GlobalConstantToken extends token_1.Token {
         }
         throw new GlobalConstantEncodingError(val, this, `Unable to encode a script containing global constants. Please provide an expanded script to the Michelson-Encoder. The following global constant hash was encountered: ${this.val.args[0]['string']}.`);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return GlobalConstantToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: GlobalConstantToken.prim,

package/dist/lib/tokens/contract.js

@@ -66,13 +66,6 @@ class ContractToken extends token_1.Token {
         }
         return { string: val };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return ContractToken.prim;
-    }
     generateSchema() {
         const valueSchema = this.createToken(this.val.args[0], 0);
         return {

package/dist/lib/tokens/key.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyToken = exports.KeyValidationError = void 0;
 const token_1 = require("./token");
 const utils_1 = require("@taquito/utils");
-const elliptic_1 = require("elliptic");
-const ec = new elliptic_1.default.ec('p256');
+const signer_1 = require("@taquito/signer");
 /**
  *  @category Error
  *  @description Error that indicates a failure happening when parsing encoding/executing a Key
@@ -57,13 +56,6 @@ class KeyToken extends token_1.ComparableToken {
         }
         return { string: val };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return KeyToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: KeyToken.prim,
@@ -79,31 +71,20 @@ class KeyToken extends token_1.ComparableToken {
             type: { prim: KeyToken.prim },
         };
     }
-    decompressP256PublicKey(compressedKey) {
-        const compressedArray = Array.from(compressedKey);
-        const keyPair = ec.keyFromPublic(compressedArray);
-        const publicKey = keyPair.getPublic();
-        const uncompressedArray = publicKey.encode('array', false);
-        return Buffer.concat([new Uint8Array([0x02]), new Uint8Array(uncompressedArray)]); // add back prefix 0x02
-    }
     compare(key1, key2) {
-        const bytes1 = (0, utils_1.b58DecodePublicKey)(key1, 'array');
-        const bytes2 = (0, utils_1.b58DecodePublicKey)(key2, 'array');
-        let array1;
-        let array2;
-        if (bytes1[0] === 0x02) {
-            array1 = this.decompressP256PublicKey(bytes1.slice(1)); // remove prefix 0x02
-        }
-        else {
-            array1 = bytes1;
+        const publicKey1 = (0, signer_1.publicKeyFromString)(key1);
+        const publicKey2 = (0, signer_1.publicKeyFromString)(key2);
+        const bytes1 = publicKey1.toProtocol();
+        const bytes2 = publicKey2.toProtocol();
+        if (bytes1[0] === bytes2[0]) {
+            return publicKey1.compare(publicKey2);
         }
-        if (bytes2[0] === 0x02) {
-            array2 = this.decompressP256PublicKey(bytes2.slice(1)); // remove prefix 0x02
+        else if (bytes1[0] > bytes2[0]) {
+            return 1;
         }
         else {
-            array2 = bytes2;
+            return -1;
         }
-        return (0, utils_1.compareArrays)(array1, array2);
     }
     findAndReturnTokens(tokenToFind, tokens) {
         if (KeyToken.prim === tokenToFind) {

package/dist/lib/tokens/lambda.js

@@ -33,18 +33,6 @@ class LambdaToken extends token_1.Token {
         }
         return val;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            [LambdaToken.prim]: {
-                parameters: this.paramSchema.ExtractSchema(),
-                returns: this.returnSchema.ExtractSchema(),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: LambdaToken.prim,

package/dist/lib/tokens/list.js

@@ -67,15 +67,6 @@ class ListToken extends token_1.Token {
             return [...prev, schema.EncodeObject(current)];
         }, []);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            [ListToken.prim]: this.valueSchema.ExtractSchema(),
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: ListToken.prim,

package/dist/lib/tokens/map.js

@@ -90,18 +90,6 @@ class MapToken extends token_1.Token {
             };
         });
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            map: {
-                key: this.KeySchema.ExtractSchema(),
-                value: this.ValueSchema.ExtractSchema(),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: MapToken.prim,

package/dist/lib/tokens/never.js

@@ -44,13 +44,6 @@ class NeverToken extends token_1.Token {
     Execute(val) {
         throw new NeverTokenError(val, this, `There is no literal value for the type never. Trying to execute ${JSON.stringify(val)}.`);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return NeverToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: NeverToken.prim,

package/dist/lib/tokens/operation.js

@@ -22,13 +22,6 @@ class OperationToken extends token_1.Token {
         }
         return { string: val };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return OperationToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: OperationToken.prim,

package/dist/lib/tokens/option.js

@@ -46,13 +46,6 @@ class OptionToken extends token_1.ComparableToken {
         }
         return { Some: this.schema().Execute(val.args[0], semantics) };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return { Some: this.schema().ExtractSchema() };
-    }
     generateSchema() {
         return {
             __michelsonType: OptionToken.prim,