@taquito/michelson-encoder 23.0.2 → 23.1.0

package/dist/lib/tokens/or.js

@@ -28,7 +28,7 @@ class OrToken extends token_1.ComparableToken {
         const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
         let keyCount = 1;
         if (leftToken instanceof OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema().schema).length;
         }
         const rightToken = this.createToken(this.val.args[1], this.getIdxForChildren() + keyCount, 'Or');
         if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
@@ -59,7 +59,7 @@ class OrToken extends token_1.ComparableToken {
         const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
         let keyCount = 1;
         if (leftToken instanceof OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema().schema).length;
         }
         const rightToken = this.createToken(this.val.args[1], this.getIdxForChildren() + keyCount, 'Or');
         const newSig = [];
@@ -90,7 +90,7 @@ class OrToken extends token_1.ComparableToken {
         const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
         let keyCount = 1;
         if (leftToken instanceof OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema().schema).length;
         }
         const rightToken = this.createToken(this.val.args[1], this.getIdxForChildren() + keyCount, 'Or');
         if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
@@ -133,7 +133,7 @@ class OrToken extends token_1.ComparableToken {
         const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
         let keyCount = 1;
         if (leftToken instanceof OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema().schema).length;
         }
         const rightToken = this.createToken(this.val.args[1], this.getIdxForChildren() + keyCount, 'Or');
         if (val.prim === 'Right') {
@@ -164,7 +164,7 @@ class OrToken extends token_1.ComparableToken {
         let leftValue;
         if (leftToken instanceof OrToken) {
             leftValue = getLeftValue(leftToken);
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema().schema).length;
         }
         else {
             leftValue = { [leftToken.annot()]: getLeftValue(leftToken) };
@@ -180,13 +180,6 @@ class OrToken extends token_1.ComparableToken {
         const res = concat(leftValue, rightValue);
         return res;
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return this.traversal((leftToken) => leftToken.ExtractSchema(), (rightToken) => rightToken.ExtractSchema(), (leftValue, rightValue) => (Object.assign(Object.assign({}, leftValue), rightValue)));
-    }
     generateSchema() {
         return {
             __michelsonType: OrToken.prim,
@@ -211,7 +204,8 @@ class OrToken extends token_1.ComparableToken {
         const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
         let keyCount = 1;
         if (leftToken instanceof OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            const schema = leftToken.generateSchema();
+            keyCount = Object.keys(schema.schema).length;
         }
         const rightToken = this.createToken(this.val.args[1], this.getIdxForChildren() + keyCount, 'Or');
         if (String(leftToken.annot()) === String(label) &&

package/dist/lib/tokens/pair.js

@@ -78,7 +78,7 @@ class PairToken extends token_1.ComparableToken {
         return this.args().map((a) => {
             const tok = this.createToken(a, this.getIdxForChildren() + cnt, 'Pair');
             if (tok instanceof PairToken) {
-                cnt += Object.keys(tok.ExtractSchema()).length;
+                cnt += Object.keys(tok.generateSchema()).length;
             }
             else {
                 cnt++;
@@ -97,7 +97,7 @@ class PairToken extends token_1.ComparableToken {
         const leftToken = this.createToken(args[0], this.getIdxForChildren(), 'Pair');
         let keyCount = 1;
         if (leftToken instanceof or_1.OrToken) {
-            keyCount = Object.keys(leftToken.ExtractSchema()).length;
+            keyCount = Object.keys(leftToken.generateSchema()).length;
         }
         const rightToken = this.createToken(args[1], this.getIdxForChildren() + keyCount, 'Pair');
         const newSig = [];
@@ -149,7 +149,7 @@ class PairToken extends token_1.ComparableToken {
         if (leftToken instanceof PairToken && !leftToken.hasAnnotations()) {
             leftValue = getLeftValue(leftToken);
             if (leftToken instanceof PairToken) {
-                keyCount = Object.keys(leftToken.ExtractSchema()).length;
+                keyCount = Object.keys(leftToken.generateSchema()).length;
             }
         }
         else {
@@ -170,13 +170,6 @@ class PairToken extends token_1.ComparableToken {
         const args = collapse(val, 'Pair');
         return this.traversal((leftToken) => leftToken.Execute(args[0], semantics), (rightToken) => rightToken.Execute(args[1], semantics));
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return this.traversal((leftToken) => leftToken.ExtractSchema(), (rightToken) => rightToken.ExtractSchema());
-    }
     generateSchema() {
         return {
             __michelsonType: PairToken.prim,

package/dist/lib/tokens/sapling-state.js

@@ -65,17 +65,6 @@ class SaplingStateToken extends token_1.Token {
             throw new SaplingStateValidationError(val, this, `Invalid sapling_state. Received: ${JSON.stringify(val)} while expecting: {}`);
         }
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            [SaplingStateToken.prim]: {
-                'memo-size': Number(this.val.args[0]['int']),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: SaplingStateToken.prim,

package/dist/lib/tokens/sapling-transaction-deprecated.js

@@ -55,17 +55,6 @@ class SaplingTransactionDeprecatedToken extends token_1.Token {
         }
         return { bytes: String(val).toString() };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            [SaplingTransactionDeprecatedToken.prim]: {
-                'memo-size': Number(this.val.args[0]['int']),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: SaplingTransactionDeprecatedToken.prim,

package/dist/lib/tokens/sapling-transaction.js

@@ -55,17 +55,6 @@ class SaplingTransactionToken extends token_1.Token {
         }
         return { bytes: String(val).toString() };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            [SaplingTransactionToken.prim]: {
-                'memo-size': Number(this.val.args[0]['int']),
-            },
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: SaplingTransactionToken.prim,

package/dist/lib/tokens/set.js

@@ -64,13 +64,6 @@ class SetToken extends token_1.Token {
             return [...prev, this.KeySchema.EncodeObject(current)];
         }, []);
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return SetToken.prim;
-    }
     generateSchema() {
         return {
             __michelsonType: SetToken.prim,

package/dist/lib/tokens/signature.js

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

package/dist/lib/tokens/ticket-deprecated.js

@@ -64,17 +64,6 @@ class TicketDeprecatedToken extends token_1.Token {
             amount: amount.Execute(val.args[2], semantics),
         };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            ticketer: contract_1.ContractToken.prim,
-            value: this.valueToken.ExtractSchema(),
-            amount: int_1.IntToken.prim,
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: TicketDeprecatedToken.prim,

package/dist/lib/tokens/ticket.js

@@ -64,17 +64,6 @@ class TicketToken extends token_1.Token {
             amount: amount.Execute(val.args[2], semantics),
         };
     }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return {
-            ticketer: contract_1.ContractToken.prim,
-            value: this.valueToken.ExtractSchema(),
-            amount: int_1.IntToken.prim,
-        };
-    }
     generateSchema() {
         return {
             __michelsonType: TicketToken.prim,

package/dist/lib/tokens/token.js

@@ -87,7 +87,7 @@ class Token {
         return this.val;
     }
     ExtractSignature() {
-        return [[this.ExtractSchema()]];
+        return [[this.generateSchema()]];
     }
 }
 exports.Token = Token;

package/dist/lib/tokens/unit.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnitToken = void 0;
 const token_1 = require("./token");
-const taquito_michelson_encoder_1 = require("../taquito-michelson-encoder");
+const constants_1 = require("../constants");
 class UnitToken extends token_1.ComparableToken {
     constructor(val, idx, fac) {
         super(val, idx, fac);
@@ -21,14 +21,7 @@ class UnitToken extends token_1.ComparableToken {
         return { prim: 'Unit' };
     }
     Execute(_val) {
-        return taquito_michelson_encoder_1.UnitValue;
-    }
-    /**
-     * @deprecated ExtractSchema has been deprecated in favor of generateSchema
-     *
-     */
-    ExtractSchema() {
-        return UnitToken.prim;
+        return constants_1.UnitValue;
     }
     generateSchema() {
         return {
@@ -40,7 +33,7 @@ class UnitToken extends token_1.ComparableToken {
         return 0;
     }
     ToKey(_val) {
-        return taquito_michelson_encoder_1.UnitValue;
+        return constants_1.UnitValue;
     }
     ToBigMapKey(_val) {
         return {

package/dist/lib/version.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 exports.VERSION = {
-    "commitHash": "20b6624f217ec85f28023ca02b2d3b73777a8df9",
-    "version": "23.0.2"
+    "commitHash": "c77fe4b0989665d8b5cfd15a7cc977499021f6fd",
+    "version": "23.1.0"
 };