@trustwallet/wallet-core 2.7.0 → 2.9.1

package/dist/generated/core_proto.js

@@ -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;
                     };
@@ -15565,7 +16013,7 @@
                      * @memberof TW.Cosmos.Proto
                      * @interface IAmount
                      * @property {string|null} [denom] Amount denom
-                     * @property {Long|null} [amount] Amount amount
+                     * @property {string|null} [amount] Amount amount
                      */
     
                     /**
@@ -15593,11 +16041,11 @@
     
                     /**
                      * Amount amount.
-                     * @member {Long} amount
+                     * @member {string} amount
                      * @memberof TW.Cosmos.Proto.Amount
                      * @instance
                      */
-                    Amount.prototype.amount = $util.Long ? $util.Long.fromBits(0,0,false) : 0;
+                    Amount.prototype.amount = "";
     
                     /**
                      * Creates a new Amount instance using the specified properties.
@@ -15626,7 +16074,7 @@
                         if (message.denom != null && Object.hasOwnProperty.call(message, "denom"))
                             writer.uint32(/* id 1, wireType 2 =*/10).string(message.denom);
                         if (message.amount != null && Object.hasOwnProperty.call(message, "amount"))
-                            writer.uint32(/* id 2, wireType 0 =*/16).int64(message.amount);
+                            writer.uint32(/* id 2, wireType 2 =*/18).string(message.amount);
                         return writer;
                     };
     
@@ -15652,7 +16100,7 @@
                                 message.denom = reader.string();
                                 break;
                             case 2:
-                                message.amount = reader.int64();
+                                message.amount = reader.string();
                                 break;
                             default:
                                 reader.skipType(tag & 7);
@@ -15677,8 +16125,8 @@
                             if (!$util.isString(message.denom))
                                 return "denom: string 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 (!$util.isString(message.amount))
+                                return "amount: string expected";
                         return null;
                     };
     
@@ -15697,14 +16145,7 @@
                         if (object.denom != null)
                             message.denom = String(object.denom);
                         if (object.amount != null)
-                            if ($util.Long)
-                                (message.amount = $util.Long.fromValue(object.amount)).unsigned = false;
-                            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();
+                            message.amount = String(object.amount);
                         return message;
                     };
     
@@ -15723,19 +16164,12 @@
                         var object = {};
                         if (options.defaults) {
                             object.denom = "";
-                            if ($util.Long) {
-                                var long = new $util.Long(0, 0, false);
-                                object.amount = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
-                            } else
-                                object.amount = options.longs === String ? "0" : 0;
+                            object.amount = "";
                         }
                         if (message.denom != null && message.hasOwnProperty("denom"))
                             object.denom = message.denom;
                         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() : message.amount;
+                            object.amount = message.amount;
                         return object;
                     };
     
@@ -16210,6 +16644,7 @@
                      * @property {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractTransfer|null} [wasmTerraExecuteContractTransferMessage] Message wasmTerraExecuteContractTransferMessage
                      * @property {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractSend|null} [wasmTerraExecuteContractSendMessage] Message wasmTerraExecuteContractSendMessage
                      * @property {TW.Cosmos.Proto.Message.ITHORChainSend|null} [thorchainSendMessage] Message thorchainSendMessage
+                     * @property {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractGeneric|null} [wasmTerraExecuteContractGeneric] Message wasmTerraExecuteContractGeneric
                      */
     
                     /**
@@ -16307,17 +16742,25 @@
                      */
                     Message.prototype.thorchainSendMessage = null;
     
+                    /**
+                     * Message wasmTerraExecuteContractGeneric.
+                     * @member {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractGeneric|null|undefined} wasmTerraExecuteContractGeneric
+                     * @memberof TW.Cosmos.Proto.Message
+                     * @instance
+                     */
+                    Message.prototype.wasmTerraExecuteContractGeneric = null;
+    
                     // OneOf field names bound to virtual getters and setters
                     var $oneOfFields;
     
                     /**
                      * Message messageOneof.
-                     * @member {"sendCoinsMessage"|"transferTokensMessage"|"stakeMessage"|"unstakeMessage"|"restakeMessage"|"withdrawStakeRewardMessage"|"rawJsonMessage"|"wasmTerraExecuteContractTransferMessage"|"wasmTerraExecuteContractSendMessage"|"thorchainSendMessage"|undefined} messageOneof
+                     * @member {"sendCoinsMessage"|"transferTokensMessage"|"stakeMessage"|"unstakeMessage"|"restakeMessage"|"withdrawStakeRewardMessage"|"rawJsonMessage"|"wasmTerraExecuteContractTransferMessage"|"wasmTerraExecuteContractSendMessage"|"thorchainSendMessage"|"wasmTerraExecuteContractGeneric"|undefined} messageOneof
                      * @memberof TW.Cosmos.Proto.Message
                      * @instance
                      */
                     Object.defineProperty(Message.prototype, "messageOneof", {
-                        get: $util.oneOfGetter($oneOfFields = ["sendCoinsMessage", "transferTokensMessage", "stakeMessage", "unstakeMessage", "restakeMessage", "withdrawStakeRewardMessage", "rawJsonMessage", "wasmTerraExecuteContractTransferMessage", "wasmTerraExecuteContractSendMessage", "thorchainSendMessage"]),
+                        get: $util.oneOfGetter($oneOfFields = ["sendCoinsMessage", "transferTokensMessage", "stakeMessage", "unstakeMessage", "restakeMessage", "withdrawStakeRewardMessage", "rawJsonMessage", "wasmTerraExecuteContractTransferMessage", "wasmTerraExecuteContractSendMessage", "thorchainSendMessage", "wasmTerraExecuteContractGeneric"]),
                         set: $util.oneOfSetter($oneOfFields)
                     });
     
@@ -16365,6 +16808,8 @@
                             $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractSend.encode(message.wasmTerraExecuteContractSendMessage, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim();
                         if (message.thorchainSendMessage != null && Object.hasOwnProperty.call(message, "thorchainSendMessage"))
                             $root.TW.Cosmos.Proto.Message.THORChainSend.encode(message.thorchainSendMessage, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim();
+                        if (message.wasmTerraExecuteContractGeneric != null && Object.hasOwnProperty.call(message, "wasmTerraExecuteContractGeneric"))
+                            $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.encode(message.wasmTerraExecuteContractGeneric, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
                         return writer;
                     };
     
@@ -16416,6 +16861,9 @@
                             case 10:
                                 message.thorchainSendMessage = $root.TW.Cosmos.Proto.Message.THORChainSend.decode(reader, reader.uint32());
                                 break;
+                            case 11:
+                                message.wasmTerraExecuteContractGeneric = $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.decode(reader, reader.uint32());
+                                break;
                             default:
                                 reader.skipType(tag & 7);
                                 break;
@@ -16534,6 +16982,16 @@
                                     return "thorchainSendMessage." + error;
                             }
                         }
+                        if (message.wasmTerraExecuteContractGeneric != null && message.hasOwnProperty("wasmTerraExecuteContractGeneric")) {
+                            if (properties.messageOneof === 1)
+                                return "messageOneof: multiple values";
+                            properties.messageOneof = 1;
+                            {
+                                var error = $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.verify(message.wasmTerraExecuteContractGeneric);
+                                if (error)
+                                    return "wasmTerraExecuteContractGeneric." + error;
+                            }
+                        }
                         return null;
                     };
     
@@ -16599,6 +17057,11 @@
                                 throw TypeError(".TW.Cosmos.Proto.Message.thorchainSendMessage: object expected");
                             message.thorchainSendMessage = $root.TW.Cosmos.Proto.Message.THORChainSend.fromObject(object.thorchainSendMessage);
                         }
+                        if (object.wasmTerraExecuteContractGeneric != null) {
+                            if (typeof object.wasmTerraExecuteContractGeneric !== "object")
+                                throw TypeError(".TW.Cosmos.Proto.Message.wasmTerraExecuteContractGeneric: object expected");
+                            message.wasmTerraExecuteContractGeneric = $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.fromObject(object.wasmTerraExecuteContractGeneric);
+                        }
                         return message;
                     };
     
@@ -16665,6 +17128,11 @@
                             if (options.oneofs)
                                 object.messageOneof = "thorchainSendMessage";
                         }
+                        if (message.wasmTerraExecuteContractGeneric != null && message.hasOwnProperty("wasmTerraExecuteContractGeneric")) {
+                            object.wasmTerraExecuteContractGeneric = $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.toObject(message.wasmTerraExecuteContractGeneric, options);
+                            if (options.oneofs)
+                                object.messageOneof = "wasmTerraExecuteContractGeneric";
+                        }
                         return object;
                     };
     
@@ -18928,6 +19396,253 @@
                         return THORChainSend;
                     })();
     
+                    Message.WasmTerraExecuteContractGeneric = (function() {
+    
+                        /**
+                         * Properties of a WasmTerraExecuteContractGeneric.
+                         * @memberof TW.Cosmos.Proto.Message
+                         * @interface IWasmTerraExecuteContractGeneric
+                         * @property {string|null} [senderAddress] WasmTerraExecuteContractGeneric senderAddress
+                         * @property {string|null} [contractAddress] WasmTerraExecuteContractGeneric contractAddress
+                         * @property {string|null} [executeMsg] WasmTerraExecuteContractGeneric executeMsg
+                         * @property {Array.<TW.Cosmos.Proto.IAmount>|null} [coins] WasmTerraExecuteContractGeneric coins
+                         */
+    
+                        /**
+                         * Constructs a new WasmTerraExecuteContractGeneric.
+                         * @memberof TW.Cosmos.Proto.Message
+                         * @classdesc Represents a WasmTerraExecuteContractGeneric.
+                         * @implements IWasmTerraExecuteContractGeneric
+                         * @constructor
+                         * @param {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractGeneric=} [properties] Properties to set
+                         */
+                        function WasmTerraExecuteContractGeneric(properties) {
+                            this.coins = [];
+                            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]];
+                        }
+    
+                        /**
+                         * WasmTerraExecuteContractGeneric senderAddress.
+                         * @member {string} senderAddress
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @instance
+                         */
+                        WasmTerraExecuteContractGeneric.prototype.senderAddress = "";
+    
+                        /**
+                         * WasmTerraExecuteContractGeneric contractAddress.
+                         * @member {string} contractAddress
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @instance
+                         */
+                        WasmTerraExecuteContractGeneric.prototype.contractAddress = "";
+    
+                        /**
+                         * WasmTerraExecuteContractGeneric executeMsg.
+                         * @member {string} executeMsg
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @instance
+                         */
+                        WasmTerraExecuteContractGeneric.prototype.executeMsg = "";
+    
+                        /**
+                         * WasmTerraExecuteContractGeneric coins.
+                         * @member {Array.<TW.Cosmos.Proto.IAmount>} coins
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @instance
+                         */
+                        WasmTerraExecuteContractGeneric.prototype.coins = $util.emptyArray;
+    
+                        /**
+                         * Creates a new WasmTerraExecuteContractGeneric instance using the specified properties.
+                         * @function create
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractGeneric=} [properties] Properties to set
+                         * @returns {TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric} WasmTerraExecuteContractGeneric instance
+                         */
+                        WasmTerraExecuteContractGeneric.create = function create(properties) {
+                            return new WasmTerraExecuteContractGeneric(properties);
+                        };
+    
+                        /**
+                         * Encodes the specified WasmTerraExecuteContractGeneric message. Does not implicitly {@link TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.verify|verify} messages.
+                         * @function encode
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {TW.Cosmos.Proto.Message.IWasmTerraExecuteContractGeneric} message WasmTerraExecuteContractGeneric message or plain object to encode
+                         * @param {$protobuf.Writer} [writer] Writer to encode to
+                         * @returns {$protobuf.Writer} Writer
+                         */
+                        WasmTerraExecuteContractGeneric.encode = function encode(message, writer) {
+                            if (!writer)
+                                writer = $Writer.create();
+                            if (message.senderAddress != null && Object.hasOwnProperty.call(message, "senderAddress"))
+                                writer.uint32(/* id 1, wireType 2 =*/10).string(message.senderAddress);
+                            if (message.contractAddress != null && Object.hasOwnProperty.call(message, "contractAddress"))
+                                writer.uint32(/* id 2, wireType 2 =*/18).string(message.contractAddress);
+                            if (message.executeMsg != null && Object.hasOwnProperty.call(message, "executeMsg"))
+                                writer.uint32(/* id 3, wireType 2 =*/26).string(message.executeMsg);
+                            if (message.coins != null && message.coins.length)
+                                for (var i = 0; i < message.coins.length; ++i)
+                                    $root.TW.Cosmos.Proto.Amount.encode(message.coins[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim();
+                            return writer;
+                        };
+    
+                        /**
+                         * Decodes a WasmTerraExecuteContractGeneric message from the specified reader or buffer.
+                         * @function decode
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+                         * @param {number} [length] Message length if known beforehand
+                         * @returns {TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric} WasmTerraExecuteContractGeneric
+                         * @throws {Error} If the payload is not a reader or valid buffer
+                         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+                         */
+                        WasmTerraExecuteContractGeneric.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.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric();
+                            while (reader.pos < end) {
+                                var tag = reader.uint32();
+                                switch (tag >>> 3) {
+                                case 1:
+                                    message.senderAddress = reader.string();
+                                    break;
+                                case 2:
+                                    message.contractAddress = reader.string();
+                                    break;
+                                case 3:
+                                    message.executeMsg = reader.string();
+                                    break;
+                                case 5:
+                                    if (!(message.coins && message.coins.length))
+                                        message.coins = [];
+                                    message.coins.push($root.TW.Cosmos.Proto.Amount.decode(reader, reader.uint32()));
+                                    break;
+                                default:
+                                    reader.skipType(tag & 7);
+                                    break;
+                                }
+                            }
+                            return message;
+                        };
+    
+                        /**
+                         * Verifies a WasmTerraExecuteContractGeneric message.
+                         * @function verify
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {Object.<string,*>} message Plain object to verify
+                         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+                         */
+                        WasmTerraExecuteContractGeneric.verify = function verify(message) {
+                            if (typeof message !== "object" || message === null)
+                                return "object expected";
+                            if (message.senderAddress != null && message.hasOwnProperty("senderAddress"))
+                                if (!$util.isString(message.senderAddress))
+                                    return "senderAddress: string expected";
+                            if (message.contractAddress != null && message.hasOwnProperty("contractAddress"))
+                                if (!$util.isString(message.contractAddress))
+                                    return "contractAddress: string expected";
+                            if (message.executeMsg != null && message.hasOwnProperty("executeMsg"))
+                                if (!$util.isString(message.executeMsg))
+                                    return "executeMsg: string expected";
+                            if (message.coins != null && message.hasOwnProperty("coins")) {
+                                if (!Array.isArray(message.coins))
+                                    return "coins: array expected";
+                                for (var i = 0; i < message.coins.length; ++i) {
+                                    var error = $root.TW.Cosmos.Proto.Amount.verify(message.coins[i]);
+                                    if (error)
+                                        return "coins." + error;
+                                }
+                            }
+                            return null;
+                        };
+    
+                        /**
+                         * Creates a WasmTerraExecuteContractGeneric message from a plain object. Also converts values to their respective internal types.
+                         * @function fromObject
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {Object.<string,*>} object Plain object
+                         * @returns {TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric} WasmTerraExecuteContractGeneric
+                         */
+                        WasmTerraExecuteContractGeneric.fromObject = function fromObject(object) {
+                            if (object instanceof $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric)
+                                return object;
+                            var message = new $root.TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric();
+                            if (object.senderAddress != null)
+                                message.senderAddress = String(object.senderAddress);
+                            if (object.contractAddress != null)
+                                message.contractAddress = String(object.contractAddress);
+                            if (object.executeMsg != null)
+                                message.executeMsg = String(object.executeMsg);
+                            if (object.coins) {
+                                if (!Array.isArray(object.coins))
+                                    throw TypeError(".TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.coins: array expected");
+                                message.coins = [];
+                                for (var i = 0; i < object.coins.length; ++i) {
+                                    if (typeof object.coins[i] !== "object")
+                                        throw TypeError(".TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric.coins: object expected");
+                                    message.coins[i] = $root.TW.Cosmos.Proto.Amount.fromObject(object.coins[i]);
+                                }
+                            }
+                            return message;
+                        };
+    
+                        /**
+                         * Creates a plain object from a WasmTerraExecuteContractGeneric message. Also converts values to other types if specified.
+                         * @function toObject
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @static
+                         * @param {TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric} message WasmTerraExecuteContractGeneric
+                         * @param {$protobuf.IConversionOptions} [options] Conversion options
+                         * @returns {Object.<string,*>} Plain object
+                         */
+                        WasmTerraExecuteContractGeneric.toObject = function toObject(message, options) {
+                            if (!options)
+                                options = {};
+                            var object = {};
+                            if (options.arrays || options.defaults)
+                                object.coins = [];
+                            if (options.defaults) {
+                                object.senderAddress = "";
+                                object.contractAddress = "";
+                                object.executeMsg = "";
+                            }
+                            if (message.senderAddress != null && message.hasOwnProperty("senderAddress"))
+                                object.senderAddress = message.senderAddress;
+                            if (message.contractAddress != null && message.hasOwnProperty("contractAddress"))
+                                object.contractAddress = message.contractAddress;
+                            if (message.executeMsg != null && message.hasOwnProperty("executeMsg"))
+                                object.executeMsg = message.executeMsg;
+                            if (message.coins && message.coins.length) {
+                                object.coins = [];
+                                for (var j = 0; j < message.coins.length; ++j)
+                                    object.coins[j] = $root.TW.Cosmos.Proto.Amount.toObject(message.coins[j], options);
+                            }
+                            return object;
+                        };
+    
+                        /**
+                         * Converts this WasmTerraExecuteContractGeneric to JSON.
+                         * @function toJSON
+                         * @memberof TW.Cosmos.Proto.Message.WasmTerraExecuteContractGeneric
+                         * @instance
+                         * @returns {Object.<string,*>} JSON object
+                         */
+                        WasmTerraExecuteContractGeneric.prototype.toJSON = function toJSON() {
+                            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+                        };
+    
+                        return WasmTerraExecuteContractGeneric;
+                    })();
+    
                     Message.RawJSON = (function() {
     
                         /**
@@ -20831,6 +21546,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -20953,6 +21669,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -23583,6 +24303,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -23695,6 +24416,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -26056,6 +26781,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -26194,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);
@@ -29433,6 +30163,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -29545,6 +30276,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -39746,7 +40481,7 @@
                      * Properties of a FunctionCall.
                      * @memberof TW.NEAR.Proto
                      * @interface IFunctionCall
-                     * @property {Uint8Array|null} [methodName] FunctionCall methodName
+                     * @property {string|null} [methodName] FunctionCall methodName
                      * @property {Uint8Array|null} [args] FunctionCall args
                      * @property {Long|null} [gas] FunctionCall gas
                      * @property {Uint8Array|null} [deposit] FunctionCall deposit
@@ -39769,11 +40504,11 @@
     
                     /**
                      * FunctionCall methodName.
-                     * @member {Uint8Array} methodName
+                     * @member {string} methodName
                      * @memberof TW.NEAR.Proto.FunctionCall
                      * @instance
                      */
-                    FunctionCall.prototype.methodName = $util.newBuffer([]);
+                    FunctionCall.prototype.methodName = "";
     
                     /**
                      * FunctionCall args.
@@ -39824,7 +40559,7 @@
                         if (!writer)
                             writer = $Writer.create();
                         if (message.methodName != null && Object.hasOwnProperty.call(message, "methodName"))
-                            writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.methodName);
+                            writer.uint32(/* id 1, wireType 2 =*/10).string(message.methodName);
                         if (message.args != null && Object.hasOwnProperty.call(message, "args"))
                             writer.uint32(/* id 2, wireType 2 =*/18).bytes(message.args);
                         if (message.gas != null && Object.hasOwnProperty.call(message, "gas"))
@@ -39853,7 +40588,7 @@
                             var tag = reader.uint32();
                             switch (tag >>> 3) {
                             case 1:
-                                message.methodName = reader.bytes();
+                                message.methodName = reader.string();
                                 break;
                             case 2:
                                 message.args = reader.bytes();
@@ -39884,8 +40619,8 @@
                         if (typeof message !== "object" || message === null)
                             return "object expected";
                         if (message.methodName != null && message.hasOwnProperty("methodName"))
-                            if (!(message.methodName && typeof message.methodName.length === "number" || $util.isString(message.methodName)))
-                                return "methodName: buffer expected";
+                            if (!$util.isString(message.methodName))
+                                return "methodName: string expected";
                         if (message.args != null && message.hasOwnProperty("args"))
                             if (!(message.args && typeof message.args.length === "number" || $util.isString(message.args)))
                                 return "args: buffer expected";
@@ -39911,10 +40646,7 @@
                             return object;
                         var message = new $root.TW.NEAR.Proto.FunctionCall();
                         if (object.methodName != null)
-                            if (typeof object.methodName === "string")
-                                $util.base64.decode(object.methodName, message.methodName = $util.newBuffer($util.base64.length(object.methodName)), 0);
-                            else if (object.methodName.length)
-                                message.methodName = object.methodName;
+                            message.methodName = String(object.methodName);
                         if (object.args != null)
                             if (typeof object.args === "string")
                                 $util.base64.decode(object.args, message.args = $util.newBuffer($util.base64.length(object.args)), 0);
@@ -39951,13 +40683,7 @@
                             options = {};
                         var object = {};
                         if (options.defaults) {
-                            if (options.bytes === String)
-                                object.methodName = "";
-                            else {
-                                object.methodName = [];
-                                if (options.bytes !== Array)
-                                    object.methodName = $util.newBuffer(object.methodName);
-                            }
+                            object.methodName = "";
                             if (options.bytes === String)
                                 object.args = "";
                             else {
@@ -39979,7 +40705,7 @@
                             }
                         }
                         if (message.methodName != null && message.hasOwnProperty("methodName"))
-                            object.methodName = options.bytes === String ? $util.base64.encode(message.methodName, 0, message.methodName.length) : options.bytes === Array ? Array.prototype.slice.call(message.methodName) : message.methodName;
+                            object.methodName = message.methodName;
                         if (message.args != null && message.hasOwnProperty("args"))
                             object.args = options.bytes === String ? $util.base64.encode(message.args, 0, message.args.length) : options.bytes === Array ? Array.prototype.slice.call(message.args) : message.args;
                         if (message.gas != null && message.hasOwnProperty("gas"))
@@ -44147,6 +44873,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -44262,6 +44989,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -44820,6 +45551,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -44959,6 +45691,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -52051,6 +52787,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         return null;
@@ -52166,6 +52903,10 @@
                         case 22:
                             message.error = 22;
                             break;
+                        case "Error_invalid_requested_token_amount":
+                        case 23:
+                            message.error = 23;
+                            break;
                         }
                         return message;
                     };
@@ -61588,6 +62329,7 @@
                             case 20:
                             case 21:
                             case 22:
+                            case 23:
                                 break;
                             }
                         if (message.errorMessage != null && message.hasOwnProperty("errorMessage"))
@@ -61711,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);