npm - @trustwallet/wallet-core - Versions diffs - 2.9.0 → 2.9.1 - Mend

@trustwallet/wallet-core 2.9.0 → 2.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/generated/core_proto.d.ts +117 -7
package/dist/generated/core_proto.js +526 -38
package/dist/lib/wallet-core.js +3 -3
package/dist/lib/wallet-core.wasm +0 -0
package/package.json +1 -1

package/dist/generated/core_proto.d.ts CHANGED Viewed

@@ -3424,7 +3424,8 @@ export namespace TW {
                 Error_input_parse = 19,
                 Error_no_support_n2n = 20,
                 Error_signatures_count = 21,
-                Error_invalid_params = 22
+                Error_invalid_params = 22,
+                Error_invalid_requested_token_amount = 23
             }
         }
     }
@@ -4652,6 +4653,9 @@ export namespace TW {
                 /** TxOutput amount */
                 amount?: (Long|null);
+                /** TxOutput tokenAmount */
+                tokenAmount?: (TW.Cardano.Proto.ITokenAmount[]|null);
             }
             /** Represents a TxOutput. */
@@ -4669,6 +4673,9 @@ export namespace TW {
                 /** TxOutput amount. */
                 public amount: Long;
+                /** TxOutput tokenAmount. */
+                public tokenAmount: TW.Cardano.Proto.ITokenAmount[];
                 /**
                  * Creates a new TxOutput instance using the specified properties.
                  * @param [properties] Properties to set
@@ -4723,6 +4730,79 @@ export namespace TW {
                 public toJSON(): { [k: string]: any };
             }
+            /** Properties of a TokenBundle. */
+            interface ITokenBundle {
+                /** TokenBundle token */
+                token?: (TW.Cardano.Proto.ITokenAmount[]|null);
+            }
+            /** Represents a TokenBundle. */
+            class TokenBundle implements ITokenBundle {
+                /**
+                 * Constructs a new TokenBundle.
+                 * @param [properties] Properties to set
+                 */
+                constructor(properties?: TW.Cardano.Proto.ITokenBundle);
+                /** TokenBundle token. */
+                public token: TW.Cardano.Proto.ITokenAmount[];
+                /**
+                 * Creates a new TokenBundle instance using the specified properties.
+                 * @param [properties] Properties to set
+                 * @returns TokenBundle instance
+                 */
+                public static create(properties?: TW.Cardano.Proto.ITokenBundle): TW.Cardano.Proto.TokenBundle;
+                /**
+                 * Encodes the specified TokenBundle message. Does not implicitly {@link TW.Cardano.Proto.TokenBundle.verify|verify} messages.
+                 * @param message TokenBundle message or plain object to encode
+                 * @param [writer] Writer to encode to
+                 * @returns Writer
+                 */
+                public static encode(message: TW.Cardano.Proto.ITokenBundle, writer?: $protobuf.Writer): $protobuf.Writer;
+                /**
+                 * Decodes a TokenBundle message from the specified reader or buffer.
+                 * @param reader Reader or buffer to decode from
+                 * @param [length] Message length if known beforehand
+                 * @returns TokenBundle
+                 * @throws {Error} If the payload is not a reader or valid buffer
+                 * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                 */
+                public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): TW.Cardano.Proto.TokenBundle;
+                /**
+                 * Verifies a TokenBundle message.
+                 * @param message Plain object to verify
+                 * @returns `null` if valid, otherwise the reason why it is not
+                 */
+                public static verify(message: { [k: string]: any }): (string|null);
+                /**
+                 * Creates a TokenBundle message from a plain object. Also converts values to their respective internal types.
+                 * @param object Plain object
+                 * @returns TokenBundle
+                 */
+                public static fromObject(object: { [k: string]: any }): TW.Cardano.Proto.TokenBundle;
+                /**
+                 * Creates a plain object from a TokenBundle message. Also converts values to other types if specified.
+                 * @param message TokenBundle
+                 * @param [options] Conversion options
+                 * @returns Plain object
+                 */
+                public static toObject(message: TW.Cardano.Proto.TokenBundle, options?: $protobuf.IConversionOptions): { [k: string]: any };
+                /**
+                 * Converts this TokenBundle to JSON.
+                 * @returns JSON object
+                 */
+                public toJSON(): { [k: string]: any };
+            }
             /** Properties of a Transfer. */
             interface ITransfer {
@@ -4735,8 +4815,14 @@ export namespace TW {
                 /** Transfer amount */
                 amount?: (Long|null);
+                /** Transfer tokenAmount */
+                tokenAmount?: (TW.Cardano.Proto.ITokenBundle|null);
                 /** Transfer useMaxAmount */
                 useMaxAmount?: (boolean|null);
+                /** Transfer forceFee */
+                forceFee?: (Long|null);
             }
             /** Represents a Transfer. */
@@ -4757,9 +4843,15 @@ export namespace TW {
                 /** Transfer amount. */
                 public amount: Long;
+                /** Transfer tokenAmount. */
+                public tokenAmount?: (TW.Cardano.Proto.ITokenBundle|null);
                 /** Transfer useMaxAmount. */
                 public useMaxAmount: boolean;
+                /** Transfer forceFee. */
+                public forceFee: Long;
                 /**
                  * Creates a new Transfer instance using the specified properties.
                  * @param [properties] Properties to set
@@ -4817,18 +4909,27 @@ export namespace TW {
             /** Properties of a TransactionPlan. */
             interface ITransactionPlan {
-                /** TransactionPlan amount */
-                amount?: (Long|null);
                 /** TransactionPlan availableAmount */
                 availableAmount?: (Long|null);
+                /** TransactionPlan amount */
+                amount?: (Long|null);
                 /** TransactionPlan fee */
                 fee?: (Long|null);
                 /** TransactionPlan change */
                 change?: (Long|null);
+                /** TransactionPlan availableTokens */
+                availableTokens?: (TW.Cardano.Proto.ITokenAmount[]|null);
+                /** TransactionPlan outputTokens */
+                outputTokens?: (TW.Cardano.Proto.ITokenAmount[]|null);
+                /** TransactionPlan changeTokens */
+                changeTokens?: (TW.Cardano.Proto.ITokenAmount[]|null);
                 /** TransactionPlan utxos */
                 utxos?: (TW.Cardano.Proto.ITxInput[]|null);
@@ -4845,18 +4946,27 @@ export namespace TW {
                  */
                 constructor(properties?: TW.Cardano.Proto.ITransactionPlan);
-                /** TransactionPlan amount. */
-                public amount: Long;
                 /** TransactionPlan availableAmount. */
                 public availableAmount: Long;
+                /** TransactionPlan amount. */
+                public amount: Long;
                 /** TransactionPlan fee. */
                 public fee: Long;
                 /** TransactionPlan change. */
                 public change: Long;
+                /** TransactionPlan availableTokens. */
+                public availableTokens: TW.Cardano.Proto.ITokenAmount[];
+                /** TransactionPlan outputTokens. */
+                public outputTokens: TW.Cardano.Proto.ITokenAmount[];
+                /** TransactionPlan changeTokens. */
+                public changeTokens: TW.Cardano.Proto.ITokenAmount[];
                 /** TransactionPlan utxos. */
                 public utxos: TW.Cardano.Proto.ITxInput[];

package/dist/generated/core_proto.js CHANGED Viewed

@@ -9875,6 +9875,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -9993,6 +9994,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.errorMessage != null)
                             message.errorMessage = String(object.errorMessage);
@@ -10097,6 +10102,7 @@
                  * @property {number} Error_no_support_n2n=20 Error_no_support_n2n value
                  * @property {number} Error_signatures_count=21 Error_signatures_count value
                  * @property {number} Error_invalid_params=22 Error_invalid_params value
+                 * @property {number} Error_invalid_requested_token_amount=23 Error_invalid_requested_token_amount value
                  */
                 Proto.SigningError = (function() {
                     var valuesById = {}, values = Object.create(valuesById);
@@ -10123,6 +10129,7 @@
                     values[valuesById[20] = "Error_no_support_n2n"] = 20;
                     values[valuesById[21] = "Error_signatures_count"] = 21;
                     values[valuesById[22] = "Error_invalid_params"] = 22;
+                    values[valuesById[23] = "Error_invalid_requested_token_amount"] = 23;
                     return values;
                 })();
@@ -12083,6 +12090,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.outputOpReturn != null && message.hasOwnProperty("outputOpReturn"))
@@ -12247,6 +12255,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.outputOpReturn != null)
                             if (typeof object.outputOpReturn === "string")
@@ -12551,6 +12563,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -12676,6 +12689,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.errorMessage != null)
                             message.errorMessage = String(object.errorMessage);
@@ -13103,6 +13120,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -13226,6 +13244,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.errorMessage != null)
                             message.errorMessage = String(object.errorMessage);
@@ -13991,6 +14013,7 @@
                      * @interface ITxOutput
                      * @property {string|null} [address] TxOutput address
                      * @property {Long|null} [amount] TxOutput amount
+                     * @property {Array.<TW.Cardano.Proto.ITokenAmount>|null} [tokenAmount] TxOutput tokenAmount
                      */
                     /**
@@ -14002,6 +14025,7 @@
                      * @param {TW.Cardano.Proto.ITxOutput=} [properties] Properties to set
                      */
                     function TxOutput(properties) {
+                        this.tokenAmount = [];
                         if (properties)
                             for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                                 if (properties[keys[i]] != null)
@@ -14024,6 +14048,14 @@
                      */
                     TxOutput.prototype.amount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
+                    /**
+                     * TxOutput tokenAmount.
+                     * @member {Array.<TW.Cardano.Proto.ITokenAmount>} tokenAmount
+                     * @memberof TW.Cardano.Proto.TxOutput
+                     * @instance
+                     */
+                    TxOutput.prototype.tokenAmount = $util.emptyArray;
                     /**
                      * Creates a new TxOutput instance using the specified properties.
                      * @function create
@@ -14052,6 +14084,9 @@
                             writer.uint32(/* id 1, wireType 2 =*/10).string(message.address);
                         if (message.amount != null && Object.hasOwnProperty.call(message, "amount"))
                             writer.uint32(/* id 2, wireType 0 =*/16).uint64(message.amount);
+                        if (message.tokenAmount != null && message.tokenAmount.length)
+                            for (var i = 0; i < message.tokenAmount.length; ++i)
+                                $root.TW.Cardano.Proto.TokenAmount.encode(message.tokenAmount[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
                         return writer;
                     };
@@ -14079,6 +14114,11 @@
                             case 2:
                                 message.amount = reader.uint64();
                                 break;
+                            case 3:
+                                if (!(message.tokenAmount && message.tokenAmount.length))
+                                    message.tokenAmount = [];
+                                message.tokenAmount.push($root.TW.Cardano.Proto.TokenAmount.decode(reader, reader.uint32()));
+                                break;
                             default:
                                 reader.skipType(tag & 7);
                                 break;
@@ -14104,6 +14144,15 @@
                         if (message.amount != null && message.hasOwnProperty("amount"))
                             if (!$util.isInteger(message.amount) && !(message.amount && $util.isInteger(message.amount.low) && $util.isInteger(message.amount.high)))
                                 return "amount: integer|Long expected";
+                        if (message.tokenAmount != null && message.hasOwnProperty("tokenAmount")) {
+                            if (!Array.isArray(message.tokenAmount))
+                                return "tokenAmount: array expected";
+                            for (var i = 0; i < message.tokenAmount.length; ++i) {
+                                var error = $root.TW.Cardano.Proto.TokenAmount.verify(message.tokenAmount[i]);
+                                if (error)
+                                    return "tokenAmount." + error;
+                            }
+                        }
                         return null;
                     };
@@ -14130,6 +14179,16 @@
                                 message.amount = object.amount;
                             else if (typeof object.amount === "object")
                                 message.amount = new $util.LongBits(object.amount.low >>> 0, object.amount.high >>> 0).toNumber(true);
+                        if (object.tokenAmount) {
+                            if (!Array.isArray(object.tokenAmount))
+                                throw TypeError(".TW.Cardano.Proto.TxOutput.tokenAmount: array expected");
+                            message.tokenAmount = [];
+                            for (var i = 0; i < object.tokenAmount.length; ++i) {
+                                if (typeof object.tokenAmount[i] !== "object")
+                                    throw TypeError(".TW.Cardano.Proto.TxOutput.tokenAmount: object expected");
+                                message.tokenAmount[i] = $root.TW.Cardano.Proto.TokenAmount.fromObject(object.tokenAmount[i]);
+                            }
+                        }
                         return message;
                     };
@@ -14146,6 +14205,8 @@
                         if (!options)
                             options = {};
                         var object = {};
+                        if (options.arrays || options.defaults)
+                            object.tokenAmount = [];
                         if (options.defaults) {
                             object.address = "";
                             if ($util.Long) {
@@ -14161,6 +14222,11 @@
                                 object.amount = options.longs === String ? String(message.amount) : message.amount;
                             else
                                 object.amount = options.longs === String ? $util.Long.prototype.toString.call(message.amount) : options.longs === Number ? new $util.LongBits(message.amount.low >>> 0, message.amount.high >>> 0).toNumber(true) : message.amount;
+                        if (message.tokenAmount && message.tokenAmount.length) {
+                            object.tokenAmount = [];
+                            for (var j = 0; j < message.tokenAmount.length; ++j)
+                                object.tokenAmount[j] = $root.TW.Cardano.Proto.TokenAmount.toObject(message.tokenAmount[j], options);
+                        }
                         return object;
                     };
@@ -14178,6 +14244,185 @@
                     return TxOutput;
                 })();
+                Proto.TokenBundle = (function() {
+                    /**
+                     * Properties of a TokenBundle.
+                     * @memberof TW.Cardano.Proto
+                     * @interface ITokenBundle
+                     * @property {Array.<TW.Cardano.Proto.ITokenAmount>|null} [token] TokenBundle token
+                     */
+                    /**
+                     * Constructs a new TokenBundle.
+                     * @memberof TW.Cardano.Proto
+                     * @classdesc Represents a TokenBundle.
+                     * @implements ITokenBundle
+                     * @constructor
+                     * @param {TW.Cardano.Proto.ITokenBundle=} [properties] Properties to set
+                     */
+                    function TokenBundle(properties) {
+                        this.token = [];
+                        if (properties)
+                            for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                                if (properties[keys[i]] != null)
+                                    this[keys[i]] = properties[keys[i]];
+                    }
+                    /**
+                     * TokenBundle token.
+                     * @member {Array.<TW.Cardano.Proto.ITokenAmount>} token
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @instance
+                     */
+                    TokenBundle.prototype.token = $util.emptyArray;
+                    /**
+                     * Creates a new TokenBundle instance using the specified properties.
+                     * @function create
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {TW.Cardano.Proto.ITokenBundle=} [properties] Properties to set
+                     * @returns {TW.Cardano.Proto.TokenBundle} TokenBundle instance
+                     */
+                    TokenBundle.create = function create(properties) {
+                        return new TokenBundle(properties);
+                    };
+                    /**
+                     * Encodes the specified TokenBundle message. Does not implicitly {@link TW.Cardano.Proto.TokenBundle.verify|verify} messages.
+                     * @function encode
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {TW.Cardano.Proto.ITokenBundle} message TokenBundle message or plain object to encode
+                     * @param {$protobuf.Writer} [writer] Writer to encode to
+                     * @returns {$protobuf.Writer} Writer
+                     */
+                    TokenBundle.encode = function encode(message, writer) {
+                        if (!writer)
+                            writer = $Writer.create();
+                        if (message.token != null && message.token.length)
+                            for (var i = 0; i < message.token.length; ++i)
+                                $root.TW.Cardano.Proto.TokenAmount.encode(message.token[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
+                        return writer;
+                    };
+                    /**
+                     * Decodes a TokenBundle message from the specified reader or buffer.
+                     * @function decode
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+                     * @param {number} [length] Message length if known beforehand
+                     * @returns {TW.Cardano.Proto.TokenBundle} TokenBundle
+                     * @throws {Error} If the payload is not a reader or valid buffer
+                     * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                     */
+                    TokenBundle.decode = function decode(reader, length) {
+                        if (!(reader instanceof $Reader))
+                            reader = $Reader.create(reader);
+                        var end = length === undefined ? reader.len : reader.pos + length, message = new $root.TW.Cardano.Proto.TokenBundle();
+                        while (reader.pos < end) {
+                            var tag = reader.uint32();
+                            switch (tag >>> 3) {
+                            case 1:
+                                if (!(message.token && message.token.length))
+                                    message.token = [];
+                                message.token.push($root.TW.Cardano.Proto.TokenAmount.decode(reader, reader.uint32()));
+                                break;
+                            default:
+                                reader.skipType(tag & 7);
+                                break;
+                            }
+                        }
+                        return message;
+                    };
+                    /**
+                     * Verifies a TokenBundle message.
+                     * @function verify
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {Object.<string,*>} message Plain object to verify
+                     * @returns {string|null} `null` if valid, otherwise the reason why it is not
+                     */
+                    TokenBundle.verify = function verify(message) {
+                        if (typeof message !== "object" || message === null)
+                            return "object expected";
+                        if (message.token != null && message.hasOwnProperty("token")) {
+                            if (!Array.isArray(message.token))
+                                return "token: array expected";
+                            for (var i = 0; i < message.token.length; ++i) {
+                                var error = $root.TW.Cardano.Proto.TokenAmount.verify(message.token[i]);
+                                if (error)
+                                    return "token." + error;
+                            }
+                        }
+                        return null;
+                    };
+                    /**
+                     * Creates a TokenBundle message from a plain object. Also converts values to their respective internal types.
+                     * @function fromObject
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {Object.<string,*>} object Plain object
+                     * @returns {TW.Cardano.Proto.TokenBundle} TokenBundle
+                     */
+                    TokenBundle.fromObject = function fromObject(object) {
+                        if (object instanceof $root.TW.Cardano.Proto.TokenBundle)
+                            return object;
+                        var message = new $root.TW.Cardano.Proto.TokenBundle();
+                        if (object.token) {
+                            if (!Array.isArray(object.token))
+                                throw TypeError(".TW.Cardano.Proto.TokenBundle.token: array expected");
+                            message.token = [];
+                            for (var i = 0; i < object.token.length; ++i) {
+                                if (typeof object.token[i] !== "object")
+                                    throw TypeError(".TW.Cardano.Proto.TokenBundle.token: object expected");
+                                message.token[i] = $root.TW.Cardano.Proto.TokenAmount.fromObject(object.token[i]);
+                            }
+                        }
+                        return message;
+                    };
+                    /**
+                     * Creates a plain object from a TokenBundle message. Also converts values to other types if specified.
+                     * @function toObject
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @static
+                     * @param {TW.Cardano.Proto.TokenBundle} message TokenBundle
+                     * @param {$protobuf.IConversionOptions} [options] Conversion options
+                     * @returns {Object.<string,*>} Plain object
+                     */
+                    TokenBundle.toObject = function toObject(message, options) {
+                        if (!options)
+                            options = {};
+                        var object = {};
+                        if (options.arrays || options.defaults)
+                            object.token = [];
+                        if (message.token && message.token.length) {
+                            object.token = [];
+                            for (var j = 0; j < message.token.length; ++j)
+                                object.token[j] = $root.TW.Cardano.Proto.TokenAmount.toObject(message.token[j], options);
+                        }
+                        return object;
+                    };
+                    /**
+                     * Converts this TokenBundle to JSON.
+                     * @function toJSON
+                     * @memberof TW.Cardano.Proto.TokenBundle
+                     * @instance
+                     * @returns {Object.<string,*>} JSON object
+                     */
+                    TokenBundle.prototype.toJSON = function toJSON() {
+                        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+                    };
+                    return TokenBundle;
+                })();
                 Proto.Transfer = (function() {
                     /**
@@ -14187,7 +14432,9 @@
                      * @property {string|null} [toAddress] Transfer toAddress
                      * @property {string|null} [changeAddress] Transfer changeAddress
                      * @property {Long|null} [amount] Transfer amount
+                     * @property {TW.Cardano.Proto.ITokenBundle|null} [tokenAmount] Transfer tokenAmount
                      * @property {boolean|null} [useMaxAmount] Transfer useMaxAmount
+                     * @property {Long|null} [forceFee] Transfer forceFee
                      */
                     /**
@@ -14229,6 +14476,14 @@
                      */
                     Transfer.prototype.amount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
+                    /**
+                     * Transfer tokenAmount.
+                     * @member {TW.Cardano.Proto.ITokenBundle|null|undefined} tokenAmount
+                     * @memberof TW.Cardano.Proto.Transfer
+                     * @instance
+                     */
+                    Transfer.prototype.tokenAmount = null;
                     /**
                      * Transfer useMaxAmount.
                      * @member {boolean} useMaxAmount
@@ -14237,6 +14492,14 @@
                      */
                     Transfer.prototype.useMaxAmount = false;
+                    /**
+                     * Transfer forceFee.
+                     * @member {Long} forceFee
+                     * @memberof TW.Cardano.Proto.Transfer
+                     * @instance
+                     */
+                    Transfer.prototype.forceFee = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
                     /**
                      * Creates a new Transfer instance using the specified properties.
                      * @function create
@@ -14267,8 +14530,12 @@
                             writer.uint32(/* id 2, wireType 2 =*/18).string(message.changeAddress);
                         if (message.amount != null && Object.hasOwnProperty.call(message, "amount"))
                             writer.uint32(/* id 3, wireType 0 =*/24).uint64(message.amount);
+                        if (message.tokenAmount != null && Object.hasOwnProperty.call(message, "tokenAmount"))
+                            $root.TW.Cardano.Proto.TokenBundle.encode(message.tokenAmount, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
                         if (message.useMaxAmount != null && Object.hasOwnProperty.call(message, "useMaxAmount"))
-                            writer.uint32(/* id 4, wireType 0 =*/32).bool(message.useMaxAmount);
+                            writer.uint32(/* id 5, wireType 0 =*/40).bool(message.useMaxAmount);
+                        if (message.forceFee != null && Object.hasOwnProperty.call(message, "forceFee"))
+                            writer.uint32(/* id 6, wireType 0 =*/48).uint64(message.forceFee);
                         return writer;
                     };
@@ -14300,8 +14567,14 @@
                                 message.amount = reader.uint64();
                                 break;
                             case 4:
+                                message.tokenAmount = $root.TW.Cardano.Proto.TokenBundle.decode(reader, reader.uint32());
+                                break;
+                            case 5:
                                 message.useMaxAmount = reader.bool();
                                 break;
+                            case 6:
+                                message.forceFee = reader.uint64();
+                                break;
                             default:
                                 reader.skipType(tag & 7);
                                 break;
@@ -14330,9 +14603,17 @@
                         if (message.amount != null && message.hasOwnProperty("amount"))
                             if (!$util.isInteger(message.amount) && !(message.amount && $util.isInteger(message.amount.low) && $util.isInteger(message.amount.high)))
                                 return "amount: integer|Long expected";
+                        if (message.tokenAmount != null && message.hasOwnProperty("tokenAmount")) {
+                            var error = $root.TW.Cardano.Proto.TokenBundle.verify(message.tokenAmount);
+                            if (error)
+                                return "tokenAmount." + error;
+                        }
                         if (message.useMaxAmount != null && message.hasOwnProperty("useMaxAmount"))
                             if (typeof message.useMaxAmount !== "boolean")
                                 return "useMaxAmount: boolean expected";
+                        if (message.forceFee != null && message.hasOwnProperty("forceFee"))
+                            if (!$util.isInteger(message.forceFee) && !(message.forceFee && $util.isInteger(message.forceFee.low) && $util.isInteger(message.forceFee.high)))
+                                return "forceFee: integer|Long expected";
                         return null;
                     };
@@ -14361,8 +14642,22 @@
                                 message.amount = object.amount;
                             else if (typeof object.amount === "object")
                                 message.amount = new $util.LongBits(object.amount.low >>> 0, object.amount.high >>> 0).toNumber(true);
+                        if (object.tokenAmount != null) {
+                            if (typeof object.tokenAmount !== "object")
+                                throw TypeError(".TW.Cardano.Proto.Transfer.tokenAmount: object expected");
+                            message.tokenAmount = $root.TW.Cardano.Proto.TokenBundle.fromObject(object.tokenAmount);
+                        }
                         if (object.useMaxAmount != null)
                             message.useMaxAmount = Boolean(object.useMaxAmount);
+                        if (object.forceFee != null)
+                            if ($util.Long)
+                                (message.forceFee = $util.Long.fromValue(object.forceFee)).unsigned = true;
+                            else if (typeof object.forceFee === "string")
+                                message.forceFee = parseInt(object.forceFee, 10);
+                            else if (typeof object.forceFee === "number")
+                                message.forceFee = object.forceFee;
+                            else if (typeof object.forceFee === "object")
+                                message.forceFee = new $util.LongBits(object.forceFee.low >>> 0, object.forceFee.high >>> 0).toNumber(true);
                         return message;
                     };
@@ -14387,7 +14682,13 @@
                                 object.amount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
                             } else
                                 object.amount = options.longs === String ? "0" : 0;
+                            object.tokenAmount = null;
                             object.useMaxAmount = false;
+                            if ($util.Long) {
+                                var long = new $util.Long(0, 0, true);
+                                object.forceFee = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
+                            } else
+                                object.forceFee = options.longs === String ? "0" : 0;
                         }
                         if (message.toAddress != null && message.hasOwnProperty("toAddress"))
                             object.toAddress = message.toAddress;
@@ -14398,8 +14699,15 @@
                                 object.amount = options.longs === String ? String(message.amount) : message.amount;
                             else
                                 object.amount = options.longs === String ? $util.Long.prototype.toString.call(message.amount) : options.longs === Number ? new $util.LongBits(message.amount.low >>> 0, message.amount.high >>> 0).toNumber(true) : message.amount;
+                        if (message.tokenAmount != null && message.hasOwnProperty("tokenAmount"))
+                            object.tokenAmount = $root.TW.Cardano.Proto.TokenBundle.toObject(message.tokenAmount, options);
                         if (message.useMaxAmount != null && message.hasOwnProperty("useMaxAmount"))
                             object.useMaxAmount = message.useMaxAmount;
+                        if (message.forceFee != null && message.hasOwnProperty("forceFee"))
+                            if (typeof message.forceFee === "number")
+                                object.forceFee = options.longs === String ? String(message.forceFee) : message.forceFee;
+                            else
+                                object.forceFee = options.longs === String ? $util.Long.prototype.toString.call(message.forceFee) : options.longs === Number ? new $util.LongBits(message.forceFee.low >>> 0, message.forceFee.high >>> 0).toNumber(true) : message.forceFee;
                         return object;
                     };
@@ -14423,10 +14731,13 @@
                      * Properties of a TransactionPlan.
                      * @memberof TW.Cardano.Proto
                      * @interface ITransactionPlan
-                     * @property {Long|null} [amount] TransactionPlan amount
                      * @property {Long|null} [availableAmount] TransactionPlan availableAmount
+                     * @property {Long|null} [amount] TransactionPlan amount
                      * @property {Long|null} [fee] TransactionPlan fee
                      * @property {Long|null} [change] TransactionPlan change
+                     * @property {Array.<TW.Cardano.Proto.ITokenAmount>|null} [availableTokens] TransactionPlan availableTokens
+                     * @property {Array.<TW.Cardano.Proto.ITokenAmount>|null} [outputTokens] TransactionPlan outputTokens
+                     * @property {Array.<TW.Cardano.Proto.ITokenAmount>|null} [changeTokens] TransactionPlan changeTokens
                      * @property {Array.<TW.Cardano.Proto.ITxInput>|null} [utxos] TransactionPlan utxos
                      * @property {TW.Common.Proto.SigningError|null} [error] TransactionPlan error
                      */
@@ -14440,6 +14751,9 @@
                      * @param {TW.Cardano.Proto.ITransactionPlan=} [properties] Properties to set
                      */
                     function TransactionPlan(properties) {
+                        this.availableTokens = [];
+                        this.outputTokens = [];
+                        this.changeTokens = [];
                         this.utxos = [];
                         if (properties)
                             for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
@@ -14448,20 +14762,20 @@
                     }
                     /**
-                     * TransactionPlan amount.
-                     * @member {Long} amount
+                     * TransactionPlan availableAmount.
+                     * @member {Long} availableAmount
                      * @memberof TW.Cardano.Proto.TransactionPlan
                      * @instance
                      */
-                    TransactionPlan.prototype.amount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
+                    TransactionPlan.prototype.availableAmount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
                     /**
-                     * TransactionPlan availableAmount.
-                     * @member {Long} availableAmount
+                     * TransactionPlan amount.
+                     * @member {Long} amount
                      * @memberof TW.Cardano.Proto.TransactionPlan
                      * @instance
                      */
-                    TransactionPlan.prototype.availableAmount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
+                    TransactionPlan.prototype.amount = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
                     /**
                      * TransactionPlan fee.
@@ -14479,6 +14793,30 @@
                      */
                     TransactionPlan.prototype.change = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
+                    /**
+                     * TransactionPlan availableTokens.
+                     * @member {Array.<TW.Cardano.Proto.ITokenAmount>} availableTokens
+                     * @memberof TW.Cardano.Proto.TransactionPlan
+                     * @instance
+                     */
+                    TransactionPlan.prototype.availableTokens = $util.emptyArray;
+                    /**
+                     * TransactionPlan outputTokens.
+                     * @member {Array.<TW.Cardano.Proto.ITokenAmount>} outputTokens
+                     * @memberof TW.Cardano.Proto.TransactionPlan
+                     * @instance
+                     */
+                    TransactionPlan.prototype.outputTokens = $util.emptyArray;
+                    /**
+                     * TransactionPlan changeTokens.
+                     * @member {Array.<TW.Cardano.Proto.ITokenAmount>} changeTokens
+                     * @memberof TW.Cardano.Proto.TransactionPlan
+                     * @instance
+                     */
+                    TransactionPlan.prototype.changeTokens = $util.emptyArray;
                     /**
                      * TransactionPlan utxos.
                      * @member {Array.<TW.Cardano.Proto.ITxInput>} utxos
@@ -14519,19 +14857,28 @@
                     TransactionPlan.encode = function encode(message, writer) {
                         if (!writer)
                             writer = $Writer.create();
-                        if (message.amount != null && Object.hasOwnProperty.call(message, "amount"))
-                            writer.uint32(/* id 1, wireType 0 =*/8).uint64(message.amount);
                         if (message.availableAmount != null && Object.hasOwnProperty.call(message, "availableAmount"))
-                            writer.uint32(/* id 2, wireType 0 =*/16).uint64(message.availableAmount);
+                            writer.uint32(/* id 1, wireType 0 =*/8).uint64(message.availableAmount);
+                        if (message.amount != null && Object.hasOwnProperty.call(message, "amount"))
+                            writer.uint32(/* id 2, wireType 0 =*/16).uint64(message.amount);
                         if (message.fee != null && Object.hasOwnProperty.call(message, "fee"))
                             writer.uint32(/* id 3, wireType 0 =*/24).uint64(message.fee);
                         if (message.change != null && Object.hasOwnProperty.call(message, "change"))
                             writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.change);
+                        if (message.availableTokens != null && message.availableTokens.length)
+                            for (var i = 0; i < message.availableTokens.length; ++i)
+                                $root.TW.Cardano.Proto.TokenAmount.encode(message.availableTokens[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
+                        if (message.outputTokens != null && message.outputTokens.length)
+                            for (var i = 0; i < message.outputTokens.length; ++i)
+                                $root.TW.Cardano.Proto.TokenAmount.encode(message.outputTokens[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim();
+                        if (message.changeTokens != null && message.changeTokens.length)
+                            for (var i = 0; i < message.changeTokens.length; ++i)
+                                $root.TW.Cardano.Proto.TokenAmount.encode(message.changeTokens[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
                         if (message.utxos != null && message.utxos.length)
                             for (var i = 0; i < message.utxos.length; ++i)
-                                $root.TW.Cardano.Proto.TxInput.encode(message.utxos[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
+                                $root.TW.Cardano.Proto.TxInput.encode(message.utxos[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
                         if (message.error != null && Object.hasOwnProperty.call(message, "error"))
-                            writer.uint32(/* id 6, wireType 0 =*/48).int32(message.error);
+                            writer.uint32(/* id 9, wireType 0 =*/72).int32(message.error);
                         return writer;
                     };
@@ -14554,10 +14901,10 @@
                             var tag = reader.uint32();
                             switch (tag >>> 3) {
                             case 1:
-                                message.amount = reader.uint64();
+                                message.availableAmount = reader.uint64();
                                 break;
                             case 2:
-                                message.availableAmount = reader.uint64();
+                                message.amount = reader.uint64();
                                 break;
                             case 3:
                                 message.fee = reader.uint64();
@@ -14566,11 +14913,26 @@
                                 message.change = reader.uint64();
                                 break;
                             case 5:
+                                if (!(message.availableTokens && message.availableTokens.length))
+                                    message.availableTokens = [];
+                                message.availableTokens.push($root.TW.Cardano.Proto.TokenAmount.decode(reader, reader.uint32()));
+                                break;
+                            case 6:
+                                if (!(message.outputTokens && message.outputTokens.length))
+                                    message.outputTokens = [];
+                                message.outputTokens.push($root.TW.Cardano.Proto.TokenAmount.decode(reader, reader.uint32()));
+                                break;
+                            case 7:
+                                if (!(message.changeTokens && message.changeTokens.length))
+                                    message.changeTokens = [];
+                                message.changeTokens.push($root.TW.Cardano.Proto.TokenAmount.decode(reader, reader.uint32()));
+                                break;
+                            case 8:
                                 if (!(message.utxos && message.utxos.length))
                                     message.utxos = [];
                                 message.utxos.push($root.TW.Cardano.Proto.TxInput.decode(reader, reader.uint32()));
                                 break;
-                            case 6:
+                            case 9:
                                 message.error = reader.int32();
                                 break;
                             default:
@@ -14592,18 +14954,45 @@
                     TransactionPlan.verify = function verify(message) {
                         if (typeof message !== "object" || message === null)
                             return "object expected";
-                        if (message.amount != null && message.hasOwnProperty("amount"))
-                            if (!$util.isInteger(message.amount) && !(message.amount && $util.isInteger(message.amount.low) && $util.isInteger(message.amount.high)))
-                                return "amount: integer|Long expected";
                         if (message.availableAmount != null && message.hasOwnProperty("availableAmount"))
                             if (!$util.isInteger(message.availableAmount) && !(message.availableAmount && $util.isInteger(message.availableAmount.low) && $util.isInteger(message.availableAmount.high)))
                                 return "availableAmount: integer|Long expected";
+                        if (message.amount != null && message.hasOwnProperty("amount"))
+                            if (!$util.isInteger(message.amount) && !(message.amount && $util.isInteger(message.amount.low) && $util.isInteger(message.amount.high)))
+                                return "amount: integer|Long expected";
                         if (message.fee != null && message.hasOwnProperty("fee"))
                             if (!$util.isInteger(message.fee) && !(message.fee && $util.isInteger(message.fee.low) && $util.isInteger(message.fee.high)))
                                 return "fee: integer|Long expected";
                         if (message.change != null && message.hasOwnProperty("change"))
                             if (!$util.isInteger(message.change) && !(message.change && $util.isInteger(message.change.low) && $util.isInteger(message.change.high)))
                                 return "change: integer|Long expected";
+                        if (message.availableTokens != null && message.hasOwnProperty("availableTokens")) {
+                            if (!Array.isArray(message.availableTokens))
+                                return "availableTokens: array expected";
+                            for (var i = 0; i < message.availableTokens.length; ++i) {
+                                var error = $root.TW.Cardano.Proto.TokenAmount.verify(message.availableTokens[i]);
+                                if (error)
+                                    return "availableTokens." + error;
+                            }
+                        }
+                        if (message.outputTokens != null && message.hasOwnProperty("outputTokens")) {
+                            if (!Array.isArray(message.outputTokens))
+                                return "outputTokens: array expected";
+                            for (var i = 0; i < message.outputTokens.length; ++i) {
+                                var error = $root.TW.Cardano.Proto.TokenAmount.verify(message.outputTokens[i]);
+                                if (error)
+                                    return "outputTokens." + error;
+                            }
+                        }
+                        if (message.changeTokens != null && message.hasOwnProperty("changeTokens")) {
+                            if (!Array.isArray(message.changeTokens))
+                                return "changeTokens: array expected";
+                            for (var i = 0; i < message.changeTokens.length; ++i) {
+                                var error = $root.TW.Cardano.Proto.TokenAmount.verify(message.changeTokens[i]);
+                                if (error)
+                                    return "changeTokens." + error;
+                            }
+                        }
                         if (message.utxos != null && message.hasOwnProperty("utxos")) {
                             if (!Array.isArray(message.utxos))
                                 return "utxos: array expected";
@@ -14640,6 +15029,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -14657,15 +15047,6 @@
                         if (object instanceof $root.TW.Cardano.Proto.TransactionPlan)
                             return object;
                         var message = new $root.TW.Cardano.Proto.TransactionPlan();
-                        if (object.amount != null)
-                            if ($util.Long)
-                                (message.amount = $util.Long.fromValue(object.amount)).unsigned = true;
-                            else if (typeof object.amount === "string")
-                                message.amount = parseInt(object.amount, 10);
-                            else if (typeof object.amount === "number")
-                                message.amount = object.amount;
-                            else if (typeof object.amount === "object")
-                                message.amount = new $util.LongBits(object.amount.low >>> 0, object.amount.high >>> 0).toNumber(true);
                         if (object.availableAmount != null)
                             if ($util.Long)
                                 (message.availableAmount = $util.Long.fromValue(object.availableAmount)).unsigned = true;
@@ -14675,6 +15056,15 @@
                                 message.availableAmount = object.availableAmount;
                             else if (typeof object.availableAmount === "object")
                                 message.availableAmount = new $util.LongBits(object.availableAmount.low >>> 0, object.availableAmount.high >>> 0).toNumber(true);
+                        if (object.amount != null)
+                            if ($util.Long)
+                                (message.amount = $util.Long.fromValue(object.amount)).unsigned = true;
+                            else if (typeof object.amount === "string")
+                                message.amount = parseInt(object.amount, 10);
+                            else if (typeof object.amount === "number")
+                                message.amount = object.amount;
+                            else if (typeof object.amount === "object")
+                                message.amount = new $util.LongBits(object.amount.low >>> 0, object.amount.high >>> 0).toNumber(true);
                         if (object.fee != null)
                             if ($util.Long)
                                 (message.fee = $util.Long.fromValue(object.fee)).unsigned = true;
@@ -14693,6 +15083,36 @@
                                 message.change = object.change;
                             else if (typeof object.change === "object")
                                 message.change = new $util.LongBits(object.change.low >>> 0, object.change.high >>> 0).toNumber(true);
+                        if (object.availableTokens) {
+                            if (!Array.isArray(object.availableTokens))
+                                throw TypeError(".TW.Cardano.Proto.TransactionPlan.availableTokens: array expected");
+                            message.availableTokens = [];
+                            for (var i = 0; i < object.availableTokens.length; ++i) {
+                                if (typeof object.availableTokens[i] !== "object")
+                                    throw TypeError(".TW.Cardano.Proto.TransactionPlan.availableTokens: object expected");
+                                message.availableTokens[i] = $root.TW.Cardano.Proto.TokenAmount.fromObject(object.availableTokens[i]);
+                            }
+                        }
+                        if (object.outputTokens) {
+                            if (!Array.isArray(object.outputTokens))
+                                throw TypeError(".TW.Cardano.Proto.TransactionPlan.outputTokens: array expected");
+                            message.outputTokens = [];
+                            for (var i = 0; i < object.outputTokens.length; ++i) {
+                                if (typeof object.outputTokens[i] !== "object")
+                                    throw TypeError(".TW.Cardano.Proto.TransactionPlan.outputTokens: object expected");
+                                message.outputTokens[i] = $root.TW.Cardano.Proto.TokenAmount.fromObject(object.outputTokens[i]);
+                            }
+                        }
+                        if (object.changeTokens) {
+                            if (!Array.isArray(object.changeTokens))
+                                throw TypeError(".TW.Cardano.Proto.TransactionPlan.changeTokens: array expected");
+                            message.changeTokens = [];
+                            for (var i = 0; i < object.changeTokens.length; ++i) {
+                                if (typeof object.changeTokens[i] !== "object")
+                                    throw TypeError(".TW.Cardano.Proto.TransactionPlan.changeTokens: object expected");
+                                message.changeTokens[i] = $root.TW.Cardano.Proto.TokenAmount.fromObject(object.changeTokens[i]);
+                            }
+                        }
                         if (object.utxos) {
                             if (!Array.isArray(object.utxos))
                                 throw TypeError(".TW.Cardano.Proto.TransactionPlan.utxos: array expected");
@@ -14796,6 +15216,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -14813,19 +15237,23 @@
                         if (!options)
                             options = {};
                         var object = {};
-                        if (options.arrays || options.defaults)
+                        if (options.arrays || options.defaults) {
+                            object.availableTokens = [];
+                            object.outputTokens = [];
+                            object.changeTokens = [];
                             object.utxos = [];
+                        }
                         if (options.defaults) {
                             if ($util.Long) {
                                 var long = new $util.Long(0, 0, true);
-                                object.amount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
+                                object.availableAmount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
                             } else
-                                object.amount = options.longs === String ? "0" : 0;
+                                object.availableAmount = options.longs === String ? "0" : 0;
                             if ($util.Long) {
                                 var long = new $util.Long(0, 0, true);
-                                object.availableAmount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
+                                object.amount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
                             } else
-                                object.availableAmount = options.longs === String ? "0" : 0;
+                                object.amount = options.longs === String ? "0" : 0;
                             if ($util.Long) {
                                 var long = new $util.Long(0, 0, true);
                                 object.fee = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
@@ -14838,16 +15266,16 @@
                                 object.change = options.longs === String ? "0" : 0;
                             object.error = options.enums === String ? "OK" : 0;
                         }
-                        if (message.amount != null && message.hasOwnProperty("amount"))
-                            if (typeof message.amount === "number")
-                                object.amount = options.longs === String ? String(message.amount) : message.amount;
-                            else
-                                object.amount = options.longs === String ? $util.Long.prototype.toString.call(message.amount) : options.longs === Number ? new $util.LongBits(message.amount.low >>> 0, message.amount.high >>> 0).toNumber(true) : message.amount;
                         if (message.availableAmount != null && message.hasOwnProperty("availableAmount"))
                             if (typeof message.availableAmount === "number")
                                 object.availableAmount = options.longs === String ? String(message.availableAmount) : message.availableAmount;
                             else
                                 object.availableAmount = options.longs === String ? $util.Long.prototype.toString.call(message.availableAmount) : options.longs === Number ? new $util.LongBits(message.availableAmount.low >>> 0, message.availableAmount.high >>> 0).toNumber(true) : message.availableAmount;
+                        if (message.amount != null && message.hasOwnProperty("amount"))
+                            if (typeof message.amount === "number")
+                                object.amount = options.longs === String ? String(message.amount) : message.amount;
+                            else
+                                object.amount = options.longs === String ? $util.Long.prototype.toString.call(message.amount) : options.longs === Number ? new $util.LongBits(message.amount.low >>> 0, message.amount.high >>> 0).toNumber(true) : message.amount;
                         if (message.fee != null && message.hasOwnProperty("fee"))
                             if (typeof message.fee === "number")
                                 object.fee = options.longs === String ? String(message.fee) : message.fee;
@@ -14858,6 +15286,21 @@
                                 object.change = options.longs === String ? String(message.change) : message.change;
                             else
                                 object.change = options.longs === String ? $util.Long.prototype.toString.call(message.change) : options.longs === Number ? new $util.LongBits(message.change.low >>> 0, message.change.high >>> 0).toNumber(true) : message.change;
+                        if (message.availableTokens && message.availableTokens.length) {
+                            object.availableTokens = [];
+                            for (var j = 0; j < message.availableTokens.length; ++j)
+                                object.availableTokens[j] = $root.TW.Cardano.Proto.TokenAmount.toObject(message.availableTokens[j], options);
+                        }
+                        if (message.outputTokens && message.outputTokens.length) {
+                            object.outputTokens = [];
+                            for (var j = 0; j < message.outputTokens.length; ++j)
+                                object.outputTokens[j] = $root.TW.Cardano.Proto.TokenAmount.toObject(message.outputTokens[j], options);
+                        }
+                        if (message.changeTokens && message.changeTokens.length) {
+                            object.changeTokens = [];
+                            for (var j = 0; j < message.changeTokens.length; ++j)
+                                object.changeTokens[j] = $root.TW.Cardano.Proto.TokenAmount.toObject(message.changeTokens[j], options);
+                        }
                         if (message.utxos && message.utxos.length) {
                             object.utxos = [];
                             for (var j = 0; j < message.utxos.length; ++j)
@@ -15357,6 +15800,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -15477,6 +15921,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -21098,6 +21546,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -21220,6 +21669,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -23850,6 +24303,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -23962,6 +24416,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -26323,6 +26781,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -26461,6 +26920,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.errorMessage != null)
                             message.errorMessage = String(object.errorMessage);
@@ -29700,6 +30163,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -29812,6 +30276,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -44405,6 +44873,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -44520,6 +44989,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -45078,6 +45551,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -45217,6 +45691,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -52309,6 +52787,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -52424,6 +52903,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -61846,6 +62329,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -61969,6 +62453,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         if (object.errorMessage != null)
                             message.errorMessage = String(object.errorMessage);

package/dist/lib/wallet-core.js CHANGED Viewed

@@ -103,9 +103,9 @@ m.seekable&&m.flags&1024&&Jb(m,0,2);var h="undefined"!=typeof t;if(!h)t=m.positi
 (function(){function a(e){g.asm=e.exports;oa=g.asm.R;Fa();Ga=g.asm.T;Ia.unshift(g.asm.S);G--;g.monitorRunDependencies&&g.monitorRunDependencies(G);0==G&&(null!==La&&(clearInterval(La),La=null),Ma&&(e=Ma,Ma=null,e()))}function b(e){a(e.instance)}function c(e){return Qa().then(function(f){return WebAssembly.instantiate(f,d)}).then(function(f){return f}).then(e,function(f){u("failed to asynchronously prepare wasm: "+f);x(f)})}var d={a:kd};G++;g.monitorRunDependencies&&g.monitorRunDependencies(G);if(g.instantiateWasm)try{return g.instantiateWasm(d,
 a)}catch(e){return u("Module.instantiateWasm callback failed with error: "+e),!1}(function(){return na||"function"!=typeof WebAssembly.instantiateStreaming||Na()||H.startsWith("file://")||"function"!=typeof fetch?c(b):fetch(H,{credentials:"same-origin"}).then(function(e){return WebAssembly.instantiateStreaming(e,d).then(b,function(f){u("wasm streaming compile failed: "+f);u("falling back to ArrayBuffer instantiation");return c(b)})})})();return{}})();
 g.___wasm_call_ctors=function(){return(g.___wasm_call_ctors=g.asm.S).apply(null,arguments)};var Y=g._free=function(){return(Y=g._free=g.asm.U).apply(null,arguments)},hd=g._malloc=function(){return(hd=g._malloc=g.asm.V).apply(null,arguments)},jd=g.___errno_location=function(){return(jd=g.___errno_location=g.asm.W).apply(null,arguments)},Bc=g.___getTypeName=function(){return(Bc=g.___getTypeName=g.asm.X).apply(null,arguments)};
-g.___embind_register_native_and_builtin_types=function(){return(g.___embind_register_native_and_builtin_types=g.asm.Y).apply(null,arguments)};var nb=g._emscripten_builtin_memalign=function(){return(nb=g._emscripten_builtin_memalign=g.asm.Z).apply(null,arguments)};g.___cxa_is_pointer_type=function(){return(g.___cxa_is_pointer_type=g.asm._).apply(null,arguments)};g.dynCall_iiji=function(){return(g.dynCall_iiji=g.asm.$).apply(null,arguments)};
-g.dynCall_iiiji=function(){return(g.dynCall_iiiji=g.asm.aa).apply(null,arguments)};g.dynCall_jiii=function(){return(g.dynCall_jiii=g.asm.ba).apply(null,arguments)};g.dynCall_jiiii=function(){return(g.dynCall_jiiii=g.asm.ca).apply(null,arguments)};g.dynCall_iiij=function(){return(g.dynCall_iiij=g.asm.da).apply(null,arguments)};g.dynCall_iiiij=function(){return(g.dynCall_iiiij=g.asm.ea).apply(null,arguments)};g.dynCall_jijjj=function(){return(g.dynCall_jijjj=g.asm.fa).apply(null,arguments)};
-g.dynCall_jij=function(){return(g.dynCall_jij=g.asm.ga).apply(null,arguments)};g.dynCall_viijii=function(){return(g.dynCall_viijii=g.asm.ha).apply(null,arguments)};g.dynCall_ji=function(){return(g.dynCall_ji=g.asm.ia).apply(null,arguments)};g.dynCall_viiiijijji=function(){return(g.dynCall_viiiijijji=g.asm.ja).apply(null,arguments)};g.dynCall_jj=function(){return(g.dynCall_jj=g.asm.ka).apply(null,arguments)};g.dynCall_jii=function(){return(g.dynCall_jii=g.asm.la).apply(null,arguments)};
+g.___embind_register_native_and_builtin_types=function(){return(g.___embind_register_native_and_builtin_types=g.asm.Y).apply(null,arguments)};var nb=g._emscripten_builtin_memalign=function(){return(nb=g._emscripten_builtin_memalign=g.asm.Z).apply(null,arguments)};g.___cxa_is_pointer_type=function(){return(g.___cxa_is_pointer_type=g.asm._).apply(null,arguments)};g.dynCall_jii=function(){return(g.dynCall_jii=g.asm.$).apply(null,arguments)};
+g.dynCall_ji=function(){return(g.dynCall_ji=g.asm.aa).apply(null,arguments)};g.dynCall_iiji=function(){return(g.dynCall_iiji=g.asm.ba).apply(null,arguments)};g.dynCall_iiiji=function(){return(g.dynCall_iiiji=g.asm.ca).apply(null,arguments)};g.dynCall_jiii=function(){return(g.dynCall_jiii=g.asm.da).apply(null,arguments)};g.dynCall_jiiii=function(){return(g.dynCall_jiiii=g.asm.ea).apply(null,arguments)};g.dynCall_iiij=function(){return(g.dynCall_iiij=g.asm.fa).apply(null,arguments)};
+g.dynCall_iiiij=function(){return(g.dynCall_iiiij=g.asm.ga).apply(null,arguments)};g.dynCall_jijjj=function(){return(g.dynCall_jijjj=g.asm.ha).apply(null,arguments)};g.dynCall_jij=function(){return(g.dynCall_jij=g.asm.ia).apply(null,arguments)};g.dynCall_viijii=function(){return(g.dynCall_viijii=g.asm.ja).apply(null,arguments)};g.dynCall_viiiijijji=function(){return(g.dynCall_viiiijijji=g.asm.ka).apply(null,arguments)};g.dynCall_jj=function(){return(g.dynCall_jj=g.asm.la).apply(null,arguments)};
 g.dynCall_viji=function(){return(g.dynCall_viji=g.asm.ma).apply(null,arguments)};g.dynCall_jiji=function(){return(g.dynCall_jiji=g.asm.na).apply(null,arguments)};g.dynCall_iiiiij=function(){return(g.dynCall_iiiiij=g.asm.oa).apply(null,arguments)};g.dynCall_iiiiijj=function(){return(g.dynCall_iiiiijj=g.asm.pa).apply(null,arguments)};g.dynCall_iiiiiijj=function(){return(g.dynCall_iiiiiijj=g.asm.qa).apply(null,arguments)};var ld;Ma=function md(){ld||nd();ld||(Ma=md)};
 function nd(){function a(){if(!ld&&(ld=!0,g.calledRun=!0,!pa)){g.noFSInit||Lb||(Lb=!0,Kb(),g.stdin=g.stdin,g.stdout=g.stdout,g.stderr=g.stderr,g.stdin?Ob("stdin",g.stdin):Gb("/dev/tty","/dev/stdin"),g.stdout?Ob("stdout",null,g.stdout):Gb("/dev/tty","/dev/stdout"),g.stderr?Ob("stderr",null,g.stderr):Gb("/dev/tty1","/dev/stderr"),Ib("/dev/stdin",0),Ib("/dev/stdout",1),Ib("/dev/stderr",1));sb=!1;Sa(Ia);if(g.onRuntimeInitialized)g.onRuntimeInitialized();if(g.postRun)for("function"==typeof g.postRun&&
 (g.postRun=[g.postRun]);g.postRun.length;){var b=g.postRun.shift();Ja.unshift(b)}Sa(Ja)}}if(!(0<G)){if(g.preRun)for("function"==typeof g.preRun&&(g.preRun=[g.preRun]);g.preRun.length;)Ka();Sa(Ha);0<G||(g.setStatus?(g.setStatus("Running..."),setTimeout(function(){setTimeout(function(){g.setStatus("")},1);a()},1)):a())}}g.run=nd;if(g.preInit)for("function"==typeof g.preInit&&(g.preInit=[g.preInit]);0<g.preInit.length;)g.preInit.pop()();nd();

package/dist/lib/wallet-core.wasm CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@trustwallet/wallet-core",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "wallet core wasm and protobuf models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",