@keepkey/device-protocol 7.4.0 → 7.5.0

package/lib/messages-osmosis_pb.js

@@ -19,14 +19,14 @@ var types_pb = require('./types_pb.js');
 goog.object.extend(proto, types_pb);
 goog.exportSymbol('proto.OsmosisAddress', null, global);
 goog.exportSymbol('proto.OsmosisGetAddress', null, global);
-goog.exportSymbol('proto.OsmosisIBCDeposit', null, global);
-goog.exportSymbol('proto.OsmosisIBCWithdrawal', null, global);
-goog.exportSymbol('proto.OsmosisLPAdd', null, global);
-goog.exportSymbol('proto.OsmosisLPRemove', null, global);
 goog.exportSymbol('proto.OsmosisMsgAck', null, global);
 goog.exportSymbol('proto.OsmosisMsgClaim', null, global);
 goog.exportSymbol('proto.OsmosisMsgDelegate', null, global);
 goog.exportSymbol('proto.OsmosisMsgFarmTokens', null, global);
+goog.exportSymbol('proto.OsmosisMsgIBCDeposit', null, global);
+goog.exportSymbol('proto.OsmosisMsgIBCWithdrawal', null, global);
+goog.exportSymbol('proto.OsmosisMsgLPAdd', null, global);
+goog.exportSymbol('proto.OsmosisMsgLPRemove', null, global);
 goog.exportSymbol('proto.OsmosisMsgRequest', null, global);
 goog.exportSymbol('proto.OsmosisMsgSend', null, global);
 goog.exportSymbol('proto.OsmosisMsgSwap', null, global);
@@ -255,16 +255,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisLPAdd = function(opt_data) {
+proto.OsmosisMsgClaim = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisLPAdd, jspb.Message);
+goog.inherits(proto.OsmosisMsgClaim, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisLPAdd.displayName = 'proto.OsmosisLPAdd';
+  proto.OsmosisMsgClaim.displayName = 'proto.OsmosisMsgClaim';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -276,16 +276,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisLPRemove = function(opt_data) {
+proto.OsmosisMsgLPAdd = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisLPRemove, jspb.Message);
+goog.inherits(proto.OsmosisMsgLPAdd, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisLPRemove.displayName = 'proto.OsmosisLPRemove';
+  proto.OsmosisMsgLPAdd.displayName = 'proto.OsmosisMsgLPAdd';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -297,16 +297,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisIBCDeposit = function(opt_data) {
+proto.OsmosisMsgLPRemove = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisIBCDeposit, jspb.Message);
+goog.inherits(proto.OsmosisMsgLPRemove, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisIBCDeposit.displayName = 'proto.OsmosisIBCDeposit';
+  proto.OsmosisMsgLPRemove.displayName = 'proto.OsmosisMsgLPRemove';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -318,16 +318,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisIBCWithdrawal = function(opt_data) {
+proto.OsmosisMsgFarmTokens = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisIBCWithdrawal, jspb.Message);
+goog.inherits(proto.OsmosisMsgFarmTokens, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisIBCWithdrawal.displayName = 'proto.OsmosisIBCWithdrawal';
+  proto.OsmosisMsgFarmTokens.displayName = 'proto.OsmosisMsgFarmTokens';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -339,16 +339,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisMsgClaim = function(opt_data) {
+proto.OsmosisMsgIBCDeposit = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisMsgClaim, jspb.Message);
+goog.inherits(proto.OsmosisMsgIBCDeposit, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisMsgClaim.displayName = 'proto.OsmosisMsgClaim';
+  proto.OsmosisMsgIBCDeposit.displayName = 'proto.OsmosisMsgIBCDeposit';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -360,16 +360,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisMsgSwap = function(opt_data) {
+proto.OsmosisMsgIBCWithdrawal = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisMsgSwap, jspb.Message);
+goog.inherits(proto.OsmosisMsgIBCWithdrawal, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisMsgSwap.displayName = 'proto.OsmosisMsgSwap';
+  proto.OsmosisMsgIBCWithdrawal.displayName = 'proto.OsmosisMsgIBCWithdrawal';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -381,16 +381,16 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.OsmosisMsgFarmTokens = function(opt_data) {
+proto.OsmosisMsgSwap = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.OsmosisMsgFarmTokens, jspb.Message);
+goog.inherits(proto.OsmosisMsgSwap, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.OsmosisMsgFarmTokens.displayName = 'proto.OsmosisMsgFarmTokens';
+  proto.OsmosisMsgSwap.displayName = 'proto.OsmosisMsgSwap';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -1885,7 +1885,13 @@ proto.OsmosisMsgAck.toObject = function(includeInstance, msg) {
     send: (f = msg.getSend()) && proto.OsmosisMsgSend.toObject(includeInstance, f),
     delegate: (f = msg.getDelegate()) && proto.OsmosisMsgDelegate.toObject(includeInstance, f),
     undelegate: (f = msg.getUndelegate()) && proto.OsmosisMsgUndelegate.toObject(includeInstance, f),
-    claim: (f = msg.getClaim()) && proto.OsmosisMsgClaim.toObject(includeInstance, f)
+    claim: (f = msg.getClaim()) && proto.OsmosisMsgClaim.toObject(includeInstance, f),
+    lpAdd: (f = msg.getLpAdd()) && proto.OsmosisMsgLPAdd.toObject(includeInstance, f),
+    lpRemove: (f = msg.getLpRemove()) && proto.OsmosisMsgLPRemove.toObject(includeInstance, f),
+    farmTokens: (f = msg.getFarmTokens()) && proto.OsmosisMsgFarmTokens.toObject(includeInstance, f),
+    ibcDeposit: (f = msg.getIbcDeposit()) && proto.OsmosisMsgIBCDeposit.toObject(includeInstance, f),
+    ibcWithdrawal: (f = msg.getIbcWithdrawal()) && proto.OsmosisMsgIBCWithdrawal.toObject(includeInstance, f),
+    swap: (f = msg.getSwap()) && proto.OsmosisMsgSwap.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -1942,6 +1948,36 @@ proto.OsmosisMsgAck.deserializeBinaryFromReader = function(msg, reader) {
       reader.readMessage(value,proto.OsmosisMsgClaim.deserializeBinaryFromReader);
       msg.setClaim(value);
       break;
+    case 5:
+      var value = new proto.OsmosisMsgLPAdd;
+      reader.readMessage(value,proto.OsmosisMsgLPAdd.deserializeBinaryFromReader);
+      msg.setLpAdd(value);
+      break;
+    case 6:
+      var value = new proto.OsmosisMsgLPRemove;
+      reader.readMessage(value,proto.OsmosisMsgLPRemove.deserializeBinaryFromReader);
+      msg.setLpRemove(value);
+      break;
+    case 7:
+      var value = new proto.OsmosisMsgFarmTokens;
+      reader.readMessage(value,proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader);
+      msg.setFarmTokens(value);
+      break;
+    case 8:
+      var value = new proto.OsmosisMsgIBCDeposit;
+      reader.readMessage(value,proto.OsmosisMsgIBCDeposit.deserializeBinaryFromReader);
+      msg.setIbcDeposit(value);
+      break;
+    case 9:
+      var value = new proto.OsmosisMsgIBCWithdrawal;
+      reader.readMessage(value,proto.OsmosisMsgIBCWithdrawal.deserializeBinaryFromReader);
+      msg.setIbcWithdrawal(value);
+      break;
+    case 10:
+      var value = new proto.OsmosisMsgSwap;
+      reader.readMessage(value,proto.OsmosisMsgSwap.deserializeBinaryFromReader);
+      msg.setSwap(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -2003,6 +2039,54 @@ proto.OsmosisMsgAck.serializeBinaryToWriter = function(message, writer) {
       proto.OsmosisMsgClaim.serializeBinaryToWriter
     );
   }
+  f = message.getLpAdd();
+  if (f != null) {
+    writer.writeMessage(
+      5,
+      f,
+      proto.OsmosisMsgLPAdd.serializeBinaryToWriter
+    );
+  }
+  f = message.getLpRemove();
+  if (f != null) {
+    writer.writeMessage(
+      6,
+      f,
+      proto.OsmosisMsgLPRemove.serializeBinaryToWriter
+    );
+  }
+  f = message.getFarmTokens();
+  if (f != null) {
+    writer.writeMessage(
+      7,
+      f,
+      proto.OsmosisMsgFarmTokens.serializeBinaryToWriter
+    );
+  }
+  f = message.getIbcDeposit();
+  if (f != null) {
+    writer.writeMessage(
+      8,
+      f,
+      proto.OsmosisMsgIBCDeposit.serializeBinaryToWriter
+    );
+  }
+  f = message.getIbcWithdrawal();
+  if (f != null) {
+    writer.writeMessage(
+      9,
+      f,
+      proto.OsmosisMsgIBCWithdrawal.serializeBinaryToWriter
+    );
+  }
+  f = message.getSwap();
+  if (f != null) {
+    writer.writeMessage(
+      10,
+      f,
+      proto.OsmosisMsgSwap.serializeBinaryToWriter
+    );
+  }
 };
 
 
@@ -2154,6 +2238,228 @@ proto.OsmosisMsgAck.prototype.hasClaim = function() {
 };
 
 
+/**
+ * optional OsmosisMsgLPAdd lp_add = 5;
+ * @return {?proto.OsmosisMsgLPAdd}
+ */
+proto.OsmosisMsgAck.prototype.getLpAdd = function() {
+  return /** @type{?proto.OsmosisMsgLPAdd} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgLPAdd, 5));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgLPAdd|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setLpAdd = function(value) {
+  return jspb.Message.setWrapperField(this, 5, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearLpAdd = function() {
+  return this.setLpAdd(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasLpAdd = function() {
+  return jspb.Message.getField(this, 5) != null;
+};
+
+
+/**
+ * optional OsmosisMsgLPRemove lp_remove = 6;
+ * @return {?proto.OsmosisMsgLPRemove}
+ */
+proto.OsmosisMsgAck.prototype.getLpRemove = function() {
+  return /** @type{?proto.OsmosisMsgLPRemove} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgLPRemove, 6));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgLPRemove|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setLpRemove = function(value) {
+  return jspb.Message.setWrapperField(this, 6, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearLpRemove = function() {
+  return this.setLpRemove(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasLpRemove = function() {
+  return jspb.Message.getField(this, 6) != null;
+};
+
+
+/**
+ * optional OsmosisMsgFarmTokens farm_tokens = 7;
+ * @return {?proto.OsmosisMsgFarmTokens}
+ */
+proto.OsmosisMsgAck.prototype.getFarmTokens = function() {
+  return /** @type{?proto.OsmosisMsgFarmTokens} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgFarmTokens, 7));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgFarmTokens|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setFarmTokens = function(value) {
+  return jspb.Message.setWrapperField(this, 7, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearFarmTokens = function() {
+  return this.setFarmTokens(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasFarmTokens = function() {
+  return jspb.Message.getField(this, 7) != null;
+};
+
+
+/**
+ * optional OsmosisMsgIBCDeposit ibc_deposit = 8;
+ * @return {?proto.OsmosisMsgIBCDeposit}
+ */
+proto.OsmosisMsgAck.prototype.getIbcDeposit = function() {
+  return /** @type{?proto.OsmosisMsgIBCDeposit} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgIBCDeposit, 8));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgIBCDeposit|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setIbcDeposit = function(value) {
+  return jspb.Message.setWrapperField(this, 8, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearIbcDeposit = function() {
+  return this.setIbcDeposit(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasIbcDeposit = function() {
+  return jspb.Message.getField(this, 8) != null;
+};
+
+
+/**
+ * optional OsmosisMsgIBCWithdrawal ibc_withdrawal = 9;
+ * @return {?proto.OsmosisMsgIBCWithdrawal}
+ */
+proto.OsmosisMsgAck.prototype.getIbcWithdrawal = function() {
+  return /** @type{?proto.OsmosisMsgIBCWithdrawal} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgIBCWithdrawal, 9));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgIBCWithdrawal|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setIbcWithdrawal = function(value) {
+  return jspb.Message.setWrapperField(this, 9, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearIbcWithdrawal = function() {
+  return this.setIbcWithdrawal(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasIbcWithdrawal = function() {
+  return jspb.Message.getField(this, 9) != null;
+};
+
+
+/**
+ * optional OsmosisMsgSwap swap = 10;
+ * @return {?proto.OsmosisMsgSwap}
+ */
+proto.OsmosisMsgAck.prototype.getSwap = function() {
+  return /** @type{?proto.OsmosisMsgSwap} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisMsgSwap, 10));
+};
+
+
+/**
+ * @param {?proto.OsmosisMsgSwap|undefined} value
+ * @return {!proto.OsmosisMsgAck} returns this
+*/
+proto.OsmosisMsgAck.prototype.setSwap = function(value) {
+  return jspb.Message.setWrapperField(this, 10, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgAck} returns this
+ */
+proto.OsmosisMsgAck.prototype.clearSwap = function() {
+  return this.setSwap(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgAck.prototype.hasSwap = function() {
+  return jspb.Message.getField(this, 10) != null;
+};
+
+
 
 
 
@@ -2188,7 +2494,7 @@ proto.OsmosisMsgSend.toObject = function(includeInstance, msg) {
   var f, obj = {
     fromAddress: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
     toAddress: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    amount: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
+    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f),
     addressType: (f = jspb.Message.getField(msg, 4)) == null ? undefined : f
   };
 
@@ -2235,8 +2541,9 @@ proto.OsmosisMsgSend.deserializeBinaryFromReader = function(msg, reader) {
       msg.setToAddress(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readUint64String());
-      msg.setAmount(value);
+      var value = new proto.OsmosisToken;
+      reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
+      msg.setToken(value);
       break;
     case 4:
       var value = /** @type {!proto.OutputAddressType} */ (reader.readEnum());
@@ -2285,11 +2592,12 @@ proto.OsmosisMsgSend.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
+  f = message.getToken();
   if (f != null) {
-    writer.writeUint64String(
+    writer.writeMessage(
       3,
-      f
+      f,
+      proto.OsmosisToken.serializeBinaryToWriter
     );
   }
   f = /** @type {!proto.OutputAddressType} */ (jspb.Message.getField(message, 4));
@@ -2375,29 +2683,30 @@ proto.OsmosisMsgSend.prototype.hasToAddress = function() {
 
 
 /**
- * optional uint64 amount = 3;
- * @return {string}
+ * optional OsmosisToken token = 3;
+ * @return {?proto.OsmosisToken}
  */
-proto.OsmosisMsgSend.prototype.getAmount = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "0"));
+proto.OsmosisMsgSend.prototype.getToken = function() {
+  return /** @type{?proto.OsmosisToken} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
 };
 
 
 /**
- * @param {string} value
+ * @param {?proto.OsmosisToken|undefined} value
  * @return {!proto.OsmosisMsgSend} returns this
- */
-proto.OsmosisMsgSend.prototype.setAmount = function(value) {
-  return jspb.Message.setField(this, 3, value);
+*/
+proto.OsmosisMsgSend.prototype.setToken = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
 /**
- * Clears the field making it undefined.
+ * Clears the message field making it undefined.
  * @return {!proto.OsmosisMsgSend} returns this
  */
-proto.OsmosisMsgSend.prototype.clearAmount = function() {
-  return jspb.Message.setField(this, 3, undefined);
+proto.OsmosisMsgSend.prototype.clearToken = function() {
+  return this.setToken(undefined);
 };
 
 
@@ -2405,7 +2714,7 @@ proto.OsmosisMsgSend.prototype.clearAmount = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSend.prototype.hasAmount = function() {
+proto.OsmosisMsgSend.prototype.hasToken = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -2956,8 +3265,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisLPAdd.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisLPAdd.toObject(opt_includeInstance, this);
+proto.OsmosisMsgClaim.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgClaim.toObject(opt_includeInstance, this);
 };
 
 
@@ -2966,17 +3275,15 @@ proto.OsmosisLPAdd.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisLPAdd} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgClaim} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisLPAdd.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgClaim.toObject = function(includeInstance, msg) {
   var f, obj = {
-    sender: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    poolId: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    shareOutAmount: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
-    tokenInMaxA: (f = msg.getTokenInMaxA()) && proto.OsmosisToken.toObject(includeInstance, f),
-    tokenInMaxB: (f = msg.getTokenInMaxB()) && proto.OsmosisToken.toObject(includeInstance, f)
+    delegatorAddress: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    validatorAddress: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -2990,23 +3297,23 @@ proto.OsmosisLPAdd.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisLPAdd}
+ * @return {!proto.OsmosisMsgClaim}
  */
-proto.OsmosisLPAdd.deserializeBinary = function(bytes) {
+proto.OsmosisMsgClaim.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisLPAdd;
-  return proto.OsmosisLPAdd.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgClaim;
+  return proto.OsmosisMsgClaim.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisLPAdd} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgClaim} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisLPAdd}
+ * @return {!proto.OsmosisMsgClaim}
  */
-proto.OsmosisLPAdd.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgClaim.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3015,25 +3322,16 @@ proto.OsmosisLPAdd.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSender(value);
+      msg.setDelegatorAddress(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPoolId(value);
+      msg.setValidatorAddress(value);
       break;
     case 3:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setShareOutAmount(value);
-      break;
-    case 4:
-      var value = new proto.OsmosisToken;
-      reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setTokenInMaxA(value);
-      break;
-    case 5:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setTokenInMaxB(value);
+      msg.setToken(value);
       break;
     default:
       reader.skipField();
@@ -3048,9 +3346,9 @@ proto.OsmosisLPAdd.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisLPAdd.prototype.serializeBinary = function() {
+proto.OsmosisMsgClaim.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisLPAdd.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgClaim.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3058,11 +3356,11 @@ proto.OsmosisLPAdd.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisLPAdd} message
+ * @param {!proto.OsmosisMsgClaim} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisLPAdd.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgClaim.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -3078,25 +3376,10 @@ proto.OsmosisLPAdd.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {number} */ (jspb.Message.getField(message, 3));
-  if (f != null) {
-    writer.writeUint64(
-      3,
-      f
-    );
-  }
-  f = message.getTokenInMaxA();
-  if (f != null) {
-    writer.writeMessage(
-      4,
-      f,
-      proto.OsmosisToken.serializeBinaryToWriter
-    );
-  }
-  f = message.getTokenInMaxB();
+  f = message.getToken();
   if (f != null) {
     writer.writeMessage(
-      5,
+      3,
       f,
       proto.OsmosisToken.serializeBinaryToWriter
     );
@@ -3105,28 +3388,28 @@ proto.OsmosisLPAdd.serializeBinaryToWriter = function(message, writer) {
 
 
 /**
- * optional string sender = 1;
+ * optional string delegator_address = 1;
  * @return {string}
  */
-proto.OsmosisLPAdd.prototype.getSender = function() {
+proto.OsmosisMsgClaim.prototype.getDelegatorAddress = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
  */
-proto.OsmosisLPAdd.prototype.setSender = function(value) {
+proto.OsmosisMsgClaim.prototype.setDelegatorAddress = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
  */
-proto.OsmosisLPAdd.prototype.clearSender = function() {
+proto.OsmosisMsgClaim.prototype.clearDelegatorAddress = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -3135,34 +3418,34 @@ proto.OsmosisLPAdd.prototype.clearSender = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPAdd.prototype.hasSender = function() {
+proto.OsmosisMsgClaim.prototype.hasDelegatorAddress = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional string pool_id = 2;
+ * optional string validator_address = 2;
  * @return {string}
  */
-proto.OsmosisLPAdd.prototype.getPoolId = function() {
+proto.OsmosisMsgClaim.prototype.getValidatorAddress = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
  */
-proto.OsmosisLPAdd.prototype.setPoolId = function(value) {
+proto.OsmosisMsgClaim.prototype.setValidatorAddress = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
  */
-proto.OsmosisLPAdd.prototype.clearPoolId = function() {
+proto.OsmosisMsgClaim.prototype.clearValidatorAddress = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -3171,109 +3454,36 @@ proto.OsmosisLPAdd.prototype.clearPoolId = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPAdd.prototype.hasPoolId = function() {
+proto.OsmosisMsgClaim.prototype.hasValidatorAddress = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional uint64 share_out_amount = 3;
- * @return {number}
- */
-proto.OsmosisLPAdd.prototype.getShareOutAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
-};
-
-
-/**
- * @param {number} value
- * @return {!proto.OsmosisLPAdd} returns this
- */
-proto.OsmosisLPAdd.prototype.setShareOutAmount = function(value) {
-  return jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisLPAdd} returns this
- */
-proto.OsmosisLPAdd.prototype.clearShareOutAmount = function() {
-  return jspb.Message.setField(this, 3, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisLPAdd.prototype.hasShareOutAmount = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * optional OsmosisToken token_in_max_a = 4;
- * @return {?proto.OsmosisToken}
- */
-proto.OsmosisLPAdd.prototype.getTokenInMaxA = function() {
-  return /** @type{?proto.OsmosisToken} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisToken, 4));
-};
-
-
-/**
- * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisLPAdd} returns this
-*/
-proto.OsmosisLPAdd.prototype.setTokenInMaxA = function(value) {
-  return jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.OsmosisLPAdd} returns this
- */
-proto.OsmosisLPAdd.prototype.clearTokenInMaxA = function() {
-  return this.setTokenInMaxA(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisLPAdd.prototype.hasTokenInMaxA = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-/**
- * optional OsmosisToken token_in_max_b = 5;
+ * optional OsmosisToken token = 3;
  * @return {?proto.OsmosisToken}
  */
-proto.OsmosisLPAdd.prototype.getTokenInMaxB = function() {
+proto.OsmosisMsgClaim.prototype.getToken = function() {
   return /** @type{?proto.OsmosisToken} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisToken, 5));
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
 };
 
 
 /**
  * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
 */
-proto.OsmosisLPAdd.prototype.setTokenInMaxB = function(value) {
-  return jspb.Message.setWrapperField(this, 5, value);
+proto.OsmosisMsgClaim.prototype.setToken = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisLPAdd} returns this
+ * @return {!proto.OsmosisMsgClaim} returns this
  */
-proto.OsmosisLPAdd.prototype.clearTokenInMaxB = function() {
-  return this.setTokenInMaxB(undefined);
+proto.OsmosisMsgClaim.prototype.clearToken = function() {
+  return this.setToken(undefined);
 };
 
 
@@ -3281,8 +3491,8 @@ proto.OsmosisLPAdd.prototype.clearTokenInMaxB = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPAdd.prototype.hasTokenInMaxB = function() {
-  return jspb.Message.getField(this, 5) != null;
+proto.OsmosisMsgClaim.prototype.hasToken = function() {
+  return jspb.Message.getField(this, 3) != null;
 };
 
 
@@ -3302,8 +3512,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisLPRemove.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisLPRemove.toObject(opt_includeInstance, this);
+proto.OsmosisMsgLPAdd.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgLPAdd.toObject(opt_includeInstance, this);
 };
 
 
@@ -3312,17 +3522,17 @@ proto.OsmosisLPRemove.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisLPRemove} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgLPAdd} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisLPRemove.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgLPAdd.toObject = function(includeInstance, msg) {
   var f, obj = {
     sender: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
     poolId: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
     shareOutAmount: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
-    tokenOutMinA: (f = msg.getTokenOutMinA()) && proto.OsmosisToken.toObject(includeInstance, f),
-    tokenOutMinB: (f = msg.getTokenOutMinB()) && proto.OsmosisToken.toObject(includeInstance, f)
+    tokenInMaxA: (f = msg.getTokenInMaxA()) && proto.OsmosisToken.toObject(includeInstance, f),
+    tokenInMaxB: (f = msg.getTokenInMaxB()) && proto.OsmosisToken.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -3336,23 +3546,23 @@ proto.OsmosisLPRemove.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisLPRemove}
+ * @return {!proto.OsmosisMsgLPAdd}
  */
-proto.OsmosisLPRemove.deserializeBinary = function(bytes) {
+proto.OsmosisMsgLPAdd.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisLPRemove;
-  return proto.OsmosisLPRemove.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgLPAdd;
+  return proto.OsmosisMsgLPAdd.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisLPRemove} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgLPAdd} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisLPRemove}
+ * @return {!proto.OsmosisMsgLPAdd}
  */
-proto.OsmosisLPRemove.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgLPAdd.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3374,12 +3584,12 @@ proto.OsmosisLPRemove.deserializeBinaryFromReader = function(msg, reader) {
     case 4:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setTokenOutMinA(value);
+      msg.setTokenInMaxA(value);
       break;
     case 5:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setTokenOutMinB(value);
+      msg.setTokenInMaxB(value);
       break;
     default:
       reader.skipField();
@@ -3394,9 +3604,9 @@ proto.OsmosisLPRemove.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisLPRemove.prototype.serializeBinary = function() {
+proto.OsmosisMsgLPAdd.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisLPRemove.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgLPAdd.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3404,11 +3614,11 @@ proto.OsmosisLPRemove.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisLPRemove} message
+ * @param {!proto.OsmosisMsgLPAdd} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisLPRemove.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgLPAdd.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -3431,7 +3641,7 @@ proto.OsmosisLPRemove.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = message.getTokenOutMinA();
+  f = message.getTokenInMaxA();
   if (f != null) {
     writer.writeMessage(
       4,
@@ -3439,7 +3649,7 @@ proto.OsmosisLPRemove.serializeBinaryToWriter = function(message, writer) {
       proto.OsmosisToken.serializeBinaryToWriter
     );
   }
-  f = message.getTokenOutMinB();
+  f = message.getTokenInMaxB();
   if (f != null) {
     writer.writeMessage(
       5,
@@ -3454,25 +3664,25 @@ proto.OsmosisLPRemove.serializeBinaryToWriter = function(message, writer) {
  * optional string sender = 1;
  * @return {string}
  */
-proto.OsmosisLPRemove.prototype.getSender = function() {
+proto.OsmosisMsgLPAdd.prototype.getSender = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.setSender = function(value) {
+proto.OsmosisMsgLPAdd.prototype.setSender = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.clearSender = function() {
+proto.OsmosisMsgLPAdd.prototype.clearSender = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -3481,7 +3691,7 @@ proto.OsmosisLPRemove.prototype.clearSender = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPRemove.prototype.hasSender = function() {
+proto.OsmosisMsgLPAdd.prototype.hasSender = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
@@ -3490,25 +3700,25 @@ proto.OsmosisLPRemove.prototype.hasSender = function() {
  * optional string pool_id = 2;
  * @return {string}
  */
-proto.OsmosisLPRemove.prototype.getPoolId = function() {
+proto.OsmosisMsgLPAdd.prototype.getPoolId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.setPoolId = function(value) {
+proto.OsmosisMsgLPAdd.prototype.setPoolId = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.clearPoolId = function() {
+proto.OsmosisMsgLPAdd.prototype.clearPoolId = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -3517,7 +3727,7 @@ proto.OsmosisLPRemove.prototype.clearPoolId = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPRemove.prototype.hasPoolId = function() {
+proto.OsmosisMsgLPAdd.prototype.hasPoolId = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -3526,25 +3736,25 @@ proto.OsmosisLPRemove.prototype.hasPoolId = function() {
  * optional uint64 share_out_amount = 3;
  * @return {number}
  */
-proto.OsmosisLPRemove.prototype.getShareOutAmount = function() {
+proto.OsmosisMsgLPAdd.prototype.getShareOutAmount = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.setShareOutAmount = function(value) {
+proto.OsmosisMsgLPAdd.prototype.setShareOutAmount = function(value) {
   return jspb.Message.setField(this, 3, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.clearShareOutAmount = function() {
+proto.OsmosisMsgLPAdd.prototype.clearShareOutAmount = function() {
   return jspb.Message.setField(this, 3, undefined);
 };
 
@@ -3553,16 +3763,16 @@ proto.OsmosisLPRemove.prototype.clearShareOutAmount = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPRemove.prototype.hasShareOutAmount = function() {
+proto.OsmosisMsgLPAdd.prototype.hasShareOutAmount = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
- * optional OsmosisToken token_out_min_a = 4;
+ * optional OsmosisToken token_in_max_a = 4;
  * @return {?proto.OsmosisToken}
  */
-proto.OsmosisLPRemove.prototype.getTokenOutMinA = function() {
+proto.OsmosisMsgLPAdd.prototype.getTokenInMaxA = function() {
   return /** @type{?proto.OsmosisToken} */ (
     jspb.Message.getWrapperField(this, proto.OsmosisToken, 4));
 };
@@ -3570,19 +3780,19 @@ proto.OsmosisLPRemove.prototype.getTokenOutMinA = function() {
 
 /**
  * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
 */
-proto.OsmosisLPRemove.prototype.setTokenOutMinA = function(value) {
+proto.OsmosisMsgLPAdd.prototype.setTokenInMaxA = function(value) {
   return jspb.Message.setWrapperField(this, 4, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.clearTokenOutMinA = function() {
-  return this.setTokenOutMinA(undefined);
+proto.OsmosisMsgLPAdd.prototype.clearTokenInMaxA = function() {
+  return this.setTokenInMaxA(undefined);
 };
 
 
@@ -3590,16 +3800,16 @@ proto.OsmosisLPRemove.prototype.clearTokenOutMinA = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPRemove.prototype.hasTokenOutMinA = function() {
+proto.OsmosisMsgLPAdd.prototype.hasTokenInMaxA = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
- * optional OsmosisToken token_out_min_b = 5;
+ * optional OsmosisToken token_in_max_b = 5;
  * @return {?proto.OsmosisToken}
  */
-proto.OsmosisLPRemove.prototype.getTokenOutMinB = function() {
+proto.OsmosisMsgLPAdd.prototype.getTokenInMaxB = function() {
   return /** @type{?proto.OsmosisToken} */ (
     jspb.Message.getWrapperField(this, proto.OsmosisToken, 5));
 };
@@ -3607,19 +3817,19 @@ proto.OsmosisLPRemove.prototype.getTokenOutMinB = function() {
 
 /**
  * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
 */
-proto.OsmosisLPRemove.prototype.setTokenOutMinB = function(value) {
+proto.OsmosisMsgLPAdd.prototype.setTokenInMaxB = function(value) {
   return jspb.Message.setWrapperField(this, 5, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisLPRemove} returns this
+ * @return {!proto.OsmosisMsgLPAdd} returns this
  */
-proto.OsmosisLPRemove.prototype.clearTokenOutMinB = function() {
-  return this.setTokenOutMinB(undefined);
+proto.OsmosisMsgLPAdd.prototype.clearTokenInMaxB = function() {
+  return this.setTokenInMaxB(undefined);
 };
 
 
@@ -3627,7 +3837,7 @@ proto.OsmosisLPRemove.prototype.clearTokenOutMinB = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisLPRemove.prototype.hasTokenOutMinB = function() {
+proto.OsmosisMsgLPAdd.prototype.hasTokenInMaxB = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
@@ -3648,8 +3858,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisIBCDeposit.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisIBCDeposit.toObject(opt_includeInstance, this);
+proto.OsmosisMsgLPRemove.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgLPRemove.toObject(opt_includeInstance, this);
 };
 
 
@@ -3658,19 +3868,17 @@ proto.OsmosisIBCDeposit.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisIBCDeposit} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgLPRemove} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisIBCDeposit.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgLPRemove.toObject = function(includeInstance, msg) {
   var f, obj = {
-    sourcePort: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    sourceChannel: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    sourceChain: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
-    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f),
-    sender: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f,
-    receiver: (f = jspb.Message.getField(msg, 6)) == null ? undefined : f,
-    timeoutHeight: (f = msg.getTimeoutHeight()) && proto.OsmosisTimeoutHeight.toObject(includeInstance, f)
+    sender: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    poolId: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    shareOutAmount: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
+    tokenOutMinA: (f = msg.getTokenOutMinA()) && proto.OsmosisToken.toObject(includeInstance, f),
+    tokenOutMinB: (f = msg.getTokenOutMinB()) && proto.OsmosisToken.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -3684,23 +3892,23 @@ proto.OsmosisIBCDeposit.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisIBCDeposit}
+ * @return {!proto.OsmosisMsgLPRemove}
  */
-proto.OsmosisIBCDeposit.deserializeBinary = function(bytes) {
+proto.OsmosisMsgLPRemove.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisIBCDeposit;
-  return proto.OsmosisIBCDeposit.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgLPRemove;
+  return proto.OsmosisMsgLPRemove.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisIBCDeposit} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgLPRemove} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisIBCDeposit}
+ * @return {!proto.OsmosisMsgLPRemove}
  */
-proto.OsmosisIBCDeposit.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgLPRemove.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -3709,33 +3917,25 @@ proto.OsmosisIBCDeposit.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSourcePort(value);
+      msg.setSender(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSourceChannel(value);
+      msg.setPoolId(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSourceChain(value);
+      var value = /** @type {number} */ (reader.readUint64());
+      msg.setShareOutAmount(value);
       break;
     case 4:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setToken(value);
+      msg.setTokenOutMinA(value);
       break;
     case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSender(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setReceiver(value);
-      break;
-    case 7:
-      var value = new proto.OsmosisTimeoutHeight;
-      reader.readMessage(value,proto.OsmosisTimeoutHeight.deserializeBinaryFromReader);
-      msg.setTimeoutHeight(value);
+      var value = new proto.OsmosisToken;
+      reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
+      msg.setTokenOutMinB(value);
       break;
     default:
       reader.skipField();
@@ -3750,9 +3950,9 @@ proto.OsmosisIBCDeposit.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisIBCDeposit.prototype.serializeBinary = function() {
+proto.OsmosisMsgLPRemove.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisIBCDeposit.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgLPRemove.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -3760,11 +3960,11 @@ proto.OsmosisIBCDeposit.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisIBCDeposit} message
+ * @param {!proto.OsmosisMsgLPRemove} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisIBCDeposit.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgLPRemove.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -3780,14 +3980,14 @@ proto.OsmosisIBCDeposit.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
+  f = /** @type {number} */ (jspb.Message.getField(message, 3));
   if (f != null) {
-    writer.writeString(
+    writer.writeUint64(
       3,
       f
     );
   }
-  f = message.getToken();
+  f = message.getTokenOutMinA();
   if (f != null) {
     writer.writeMessage(
       4,
@@ -3795,54 +3995,40 @@ proto.OsmosisIBCDeposit.serializeBinaryToWriter = function(message, writer) {
       proto.OsmosisToken.serializeBinaryToWriter
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 5));
-  if (f != null) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = /** @type {string} */ (jspb.Message.getField(message, 6));
-  if (f != null) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-  f = message.getTimeoutHeight();
+  f = message.getTokenOutMinB();
   if (f != null) {
     writer.writeMessage(
-      7,
+      5,
       f,
-      proto.OsmosisTimeoutHeight.serializeBinaryToWriter
+      proto.OsmosisToken.serializeBinaryToWriter
     );
   }
 };
 
 
 /**
- * optional string source_port = 1;
+ * optional string sender = 1;
  * @return {string}
  */
-proto.OsmosisIBCDeposit.prototype.getSourcePort = function() {
+proto.OsmosisMsgLPRemove.prototype.getSender = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.setSourcePort = function(value) {
+proto.OsmosisMsgLPRemove.prototype.setSender = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.clearSourcePort = function() {
+proto.OsmosisMsgLPRemove.prototype.clearSender = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -3851,34 +4037,34 @@ proto.OsmosisIBCDeposit.prototype.clearSourcePort = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCDeposit.prototype.hasSourcePort = function() {
+proto.OsmosisMsgLPRemove.prototype.hasSender = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional string source_channel = 2;
+ * optional string pool_id = 2;
  * @return {string}
  */
-proto.OsmosisIBCDeposit.prototype.getSourceChannel = function() {
+proto.OsmosisMsgLPRemove.prototype.getPoolId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.setSourceChannel = function(value) {
+proto.OsmosisMsgLPRemove.prototype.setPoolId = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.clearSourceChannel = function() {
+proto.OsmosisMsgLPRemove.prototype.clearPoolId = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -3887,34 +4073,34 @@ proto.OsmosisIBCDeposit.prototype.clearSourceChannel = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCDeposit.prototype.hasSourceChannel = function() {
+proto.OsmosisMsgLPRemove.prototype.hasPoolId = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional string source_chain = 3;
- * @return {string}
+ * optional uint64 share_out_amount = 3;
+ * @return {number}
  */
-proto.OsmosisIBCDeposit.prototype.getSourceChain = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+proto.OsmosisMsgLPRemove.prototype.getShareOutAmount = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @param {number} value
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.setSourceChain = function(value) {
+proto.OsmosisMsgLPRemove.prototype.setShareOutAmount = function(value) {
   return jspb.Message.setField(this, 3, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.clearSourceChain = function() {
+proto.OsmosisMsgLPRemove.prototype.clearShareOutAmount = function() {
   return jspb.Message.setField(this, 3, undefined);
 };
 
@@ -3923,16 +4109,16 @@ proto.OsmosisIBCDeposit.prototype.clearSourceChain = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCDeposit.prototype.hasSourceChain = function() {
+proto.OsmosisMsgLPRemove.prototype.hasShareOutAmount = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
- * optional OsmosisToken token = 4;
+ * optional OsmosisToken token_out_min_a = 4;
  * @return {?proto.OsmosisToken}
  */
-proto.OsmosisIBCDeposit.prototype.getToken = function() {
+proto.OsmosisMsgLPRemove.prototype.getTokenOutMinA = function() {
   return /** @type{?proto.OsmosisToken} */ (
     jspb.Message.getWrapperField(this, proto.OsmosisToken, 4));
 };
@@ -3940,19 +4126,19 @@ proto.OsmosisIBCDeposit.prototype.getToken = function() {
 
 /**
  * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
 */
-proto.OsmosisIBCDeposit.prototype.setToken = function(value) {
+proto.OsmosisMsgLPRemove.prototype.setTokenOutMinA = function(value) {
   return jspb.Message.setWrapperField(this, 4, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.clearToken = function() {
-  return this.setToken(undefined);
+proto.OsmosisMsgLPRemove.prototype.clearTokenOutMinA = function() {
+  return this.setTokenOutMinA(undefined);
 };
 
 
@@ -3960,35 +4146,36 @@ proto.OsmosisIBCDeposit.prototype.clearToken = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCDeposit.prototype.hasToken = function() {
+proto.OsmosisMsgLPRemove.prototype.hasTokenOutMinA = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
- * optional string sender = 5;
- * @return {string}
+ * optional OsmosisToken token_out_min_b = 5;
+ * @return {?proto.OsmosisToken}
  */
-proto.OsmosisIBCDeposit.prototype.getSender = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
+proto.OsmosisMsgLPRemove.prototype.getTokenOutMinB = function() {
+  return /** @type{?proto.OsmosisToken} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 5));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.OsmosisIBCDeposit} returns this
- */
-proto.OsmosisIBCDeposit.prototype.setSender = function(value) {
-  return jspb.Message.setField(this, 5, value);
+ * @param {?proto.OsmosisToken|undefined} value
+ * @return {!proto.OsmosisMsgLPRemove} returns this
+*/
+proto.OsmosisMsgLPRemove.prototype.setTokenOutMinB = function(value) {
+  return jspb.Message.setWrapperField(this, 5, value);
 };
 
 
 /**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgLPRemove} returns this
  */
-proto.OsmosisIBCDeposit.prototype.clearSender = function() {
-  return jspb.Message.setField(this, 5, undefined);
+proto.OsmosisMsgLPRemove.prototype.clearTokenOutMinB = function() {
+  return this.setTokenOutMinB(undefined);
 };
 
 
@@ -3996,88 +4183,15 @@ proto.OsmosisIBCDeposit.prototype.clearSender = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCDeposit.prototype.hasSender = function() {
+proto.OsmosisMsgLPRemove.prototype.hasTokenOutMinB = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
 
-/**
- * optional string receiver = 6;
- * @return {string}
- */
-proto.OsmosisIBCDeposit.prototype.getReceiver = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
 
 
-/**
- * @param {string} value
- * @return {!proto.OsmosisIBCDeposit} returns this
- */
-proto.OsmosisIBCDeposit.prototype.setReceiver = function(value) {
-  return jspb.Message.setField(this, 6, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
- */
-proto.OsmosisIBCDeposit.prototype.clearReceiver = function() {
-  return jspb.Message.setField(this, 6, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCDeposit.prototype.hasReceiver = function() {
-  return jspb.Message.getField(this, 6) != null;
-};
-
-
-/**
- * optional OsmosisTimeoutHeight timeout_height = 7;
- * @return {?proto.OsmosisTimeoutHeight}
- */
-proto.OsmosisIBCDeposit.prototype.getTimeoutHeight = function() {
-  return /** @type{?proto.OsmosisTimeoutHeight} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisTimeoutHeight, 7));
-};
-
-
-/**
- * @param {?proto.OsmosisTimeoutHeight|undefined} value
- * @return {!proto.OsmosisIBCDeposit} returns this
-*/
-proto.OsmosisIBCDeposit.prototype.setTimeoutHeight = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.OsmosisIBCDeposit} returns this
- */
-proto.OsmosisIBCDeposit.prototype.clearTimeoutHeight = function() {
-  return this.setTimeoutHeight(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCDeposit.prototype.hasTimeoutHeight = function() {
-  return jspb.Message.getField(this, 7) != null;
-};
-
-
-
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto.
  * Field names that are reserved in JavaScript and will be renamed to pb_name.
@@ -4090,8 +4204,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisIBCWithdrawal.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisIBCWithdrawal.toObject(opt_includeInstance, this);
+proto.OsmosisMsgFarmTokens.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgFarmTokens.toObject(opt_includeInstance, this);
 };
 
 
@@ -4100,19 +4214,15 @@ proto.OsmosisIBCWithdrawal.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisIBCWithdrawal} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgFarmTokens} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisIBCWithdrawal.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgFarmTokens.toObject = function(includeInstance, msg) {
   var f, obj = {
-    sourcePort: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    sourceChannel: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    sourceChain: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
-    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f),
-    sender: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f,
-    receiver: (f = jspb.Message.getField(msg, 6)) == null ? undefined : f,
-    timeoutHeight: (f = msg.getTimeoutHeight()) && proto.OsmosisTimeoutHeight.toObject(includeInstance, f)
+    owner: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    duration: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -4126,23 +4236,23 @@ proto.OsmosisIBCWithdrawal.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisIBCWithdrawal}
+ * @return {!proto.OsmosisMsgFarmTokens}
  */
-proto.OsmosisIBCWithdrawal.deserializeBinary = function(bytes) {
+proto.OsmosisMsgFarmTokens.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisIBCWithdrawal;
-  return proto.OsmosisIBCWithdrawal.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgFarmTokens;
+  return proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisIBCWithdrawal} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgFarmTokens} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisIBCWithdrawal}
+ * @return {!proto.OsmosisMsgFarmTokens}
  */
-proto.OsmosisIBCWithdrawal.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4151,34 +4261,17 @@ proto.OsmosisIBCWithdrawal.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSourcePort(value);
+      msg.setOwner(value);
       break;
     case 2:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSourceChannel(value);
+      var value = /** @type {number} */ (reader.readUint64());
+      msg.setDuration(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSourceChain(value);
-      break;
-    case 4:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
       msg.setToken(value);
       break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setSender(value);
-      break;
-    case 6:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setReceiver(value);
-      break;
-    case 7:
-      var value = new proto.OsmosisTimeoutHeight;
-      reader.readMessage(value,proto.OsmosisTimeoutHeight.deserializeBinaryFromReader);
-      msg.setTimeoutHeight(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -4192,9 +4285,9 @@ proto.OsmosisIBCWithdrawal.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisIBCWithdrawal.prototype.serializeBinary = function() {
+proto.OsmosisMsgFarmTokens.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisIBCWithdrawal.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgFarmTokens.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4202,11 +4295,11 @@ proto.OsmosisIBCWithdrawal.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisIBCWithdrawal} message
+ * @param {!proto.OsmosisMsgFarmTokens} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisIBCWithdrawal.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgFarmTokens.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -4215,76 +4308,47 @@ proto.OsmosisIBCWithdrawal.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 2));
+  f = /** @type {number} */ (jspb.Message.getField(message, 2));
   if (f != null) {
-    writer.writeString(
+    writer.writeUint64(
       2,
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
-  if (f != null) {
-    writer.writeString(
-      3,
-      f
-    );
-  }
   f = message.getToken();
   if (f != null) {
     writer.writeMessage(
-      4,
+      3,
       f,
       proto.OsmosisToken.serializeBinaryToWriter
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 5));
-  if (f != null) {
-    writer.writeString(
-      5,
-      f
-    );
-  }
-  f = /** @type {string} */ (jspb.Message.getField(message, 6));
-  if (f != null) {
-    writer.writeString(
-      6,
-      f
-    );
-  }
-  f = message.getTimeoutHeight();
-  if (f != null) {
-    writer.writeMessage(
-      7,
-      f,
-      proto.OsmosisTimeoutHeight.serializeBinaryToWriter
-    );
-  }
 };
 
 
 /**
- * optional string source_port = 1;
+ * optional string owner = 1;
  * @return {string}
  */
-proto.OsmosisIBCWithdrawal.prototype.getSourcePort = function() {
+proto.OsmosisMsgFarmTokens.prototype.getOwner = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
  */
-proto.OsmosisIBCWithdrawal.prototype.setSourcePort = function(value) {
+proto.OsmosisMsgFarmTokens.prototype.setOwner = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
  */
-proto.OsmosisIBCWithdrawal.prototype.clearSourcePort = function() {
+proto.OsmosisMsgFarmTokens.prototype.clearOwner = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -4293,34 +4357,34 @@ proto.OsmosisIBCWithdrawal.prototype.clearSourcePort = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCWithdrawal.prototype.hasSourcePort = function() {
+proto.OsmosisMsgFarmTokens.prototype.hasOwner = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional string source_channel = 2;
- * @return {string}
+ * optional uint64 duration = 2;
+ * @return {number}
  */
-proto.OsmosisIBCWithdrawal.prototype.getSourceChannel = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+proto.OsmosisMsgFarmTokens.prototype.getDuration = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @param {number} value
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
  */
-proto.OsmosisIBCWithdrawal.prototype.setSourceChannel = function(value) {
+proto.OsmosisMsgFarmTokens.prototype.setDuration = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
  */
-proto.OsmosisIBCWithdrawal.prototype.clearSourceChannel = function() {
+proto.OsmosisMsgFarmTokens.prototype.clearDuration = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -4329,181 +4393,36 @@ proto.OsmosisIBCWithdrawal.prototype.clearSourceChannel = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCWithdrawal.prototype.hasSourceChannel = function() {
-  return jspb.Message.getField(this, 2) != null;
-};
-
-
-/**
- * optional string source_chain = 3;
- * @return {string}
- */
-proto.OsmosisIBCWithdrawal.prototype.getSourceChain = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.setSourceChain = function(value) {
-  return jspb.Message.setField(this, 3, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.clearSourceChain = function() {
-  return jspb.Message.setField(this, 3, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCWithdrawal.prototype.hasSourceChain = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
-/**
- * optional OsmosisToken token = 4;
- * @return {?proto.OsmosisToken}
- */
-proto.OsmosisIBCWithdrawal.prototype.getToken = function() {
-  return /** @type{?proto.OsmosisToken} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisToken, 4));
-};
-
-
-/**
- * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
-*/
-proto.OsmosisIBCWithdrawal.prototype.setToken = function(value) {
-  return jspb.Message.setWrapperField(this, 4, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.clearToken = function() {
-  return this.setToken(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCWithdrawal.prototype.hasToken = function() {
-  return jspb.Message.getField(this, 4) != null;
-};
-
-
-/**
- * optional string sender = 5;
- * @return {string}
- */
-proto.OsmosisIBCWithdrawal.prototype.getSender = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.setSender = function(value) {
-  return jspb.Message.setField(this, 5, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.clearSender = function() {
-  return jspb.Message.setField(this, 5, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCWithdrawal.prototype.hasSender = function() {
-  return jspb.Message.getField(this, 5) != null;
-};
-
-
-/**
- * optional string receiver = 6;
- * @return {string}
- */
-proto.OsmosisIBCWithdrawal.prototype.getReceiver = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.setReceiver = function(value) {
-  return jspb.Message.setField(this, 6, value);
-};
-
-
-/**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
- */
-proto.OsmosisIBCWithdrawal.prototype.clearReceiver = function() {
-  return jspb.Message.setField(this, 6, undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.OsmosisIBCWithdrawal.prototype.hasReceiver = function() {
-  return jspb.Message.getField(this, 6) != null;
+proto.OsmosisMsgFarmTokens.prototype.hasDuration = function() {
+  return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional OsmosisTimeoutHeight timeout_height = 7;
- * @return {?proto.OsmosisTimeoutHeight}
+ * optional OsmosisToken token = 3;
+ * @return {?proto.OsmosisToken}
  */
-proto.OsmosisIBCWithdrawal.prototype.getTimeoutHeight = function() {
-  return /** @type{?proto.OsmosisTimeoutHeight} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisTimeoutHeight, 7));
+proto.OsmosisMsgFarmTokens.prototype.getToken = function() {
+  return /** @type{?proto.OsmosisToken} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
 };
 
 
 /**
- * @param {?proto.OsmosisTimeoutHeight|undefined} value
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @param {?proto.OsmosisToken|undefined} value
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
 */
-proto.OsmosisIBCWithdrawal.prototype.setTimeoutHeight = function(value) {
-  return jspb.Message.setWrapperField(this, 7, value);
+proto.OsmosisMsgFarmTokens.prototype.setToken = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisIBCWithdrawal} returns this
+ * @return {!proto.OsmosisMsgFarmTokens} returns this
  */
-proto.OsmosisIBCWithdrawal.prototype.clearTimeoutHeight = function() {
-  return this.setTimeoutHeight(undefined);
+proto.OsmosisMsgFarmTokens.prototype.clearToken = function() {
+  return this.setToken(undefined);
 };
 
 
@@ -4511,8 +4430,8 @@ proto.OsmosisIBCWithdrawal.prototype.clearTimeoutHeight = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisIBCWithdrawal.prototype.hasTimeoutHeight = function() {
-  return jspb.Message.getField(this, 7) != null;
+proto.OsmosisMsgFarmTokens.prototype.hasToken = function() {
+  return jspb.Message.getField(this, 3) != null;
 };
 
 
@@ -4532,8 +4451,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisMsgClaim.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisMsgClaim.toObject(opt_includeInstance, this);
+proto.OsmosisMsgIBCDeposit.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgIBCDeposit.toObject(opt_includeInstance, this);
 };
 
 
@@ -4542,15 +4461,18 @@ proto.OsmosisMsgClaim.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisMsgClaim} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgIBCDeposit} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgClaim.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgIBCDeposit.toObject = function(includeInstance, msg) {
   var f, obj = {
-    delegatorAddress: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    validatorAddress: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    amount: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f
+    sourcePort: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    sourceChannel: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f),
+    sender: (f = jspb.Message.getField(msg, 4)) == null ? undefined : f,
+    receiver: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f,
+    timeoutHeight: (f = msg.getTimeoutHeight()) && proto.OsmosisTimeoutHeight.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -4564,23 +4486,23 @@ proto.OsmosisMsgClaim.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisMsgClaim}
+ * @return {!proto.OsmosisMsgIBCDeposit}
  */
-proto.OsmosisMsgClaim.deserializeBinary = function(bytes) {
+proto.OsmosisMsgIBCDeposit.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisMsgClaim;
-  return proto.OsmosisMsgClaim.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgIBCDeposit;
+  return proto.OsmosisMsgIBCDeposit.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisMsgClaim} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgIBCDeposit} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisMsgClaim}
+ * @return {!proto.OsmosisMsgIBCDeposit}
  */
-proto.OsmosisMsgClaim.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgIBCDeposit.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4589,15 +4511,29 @@ proto.OsmosisMsgClaim.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setDelegatorAddress(value);
+      msg.setSourcePort(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setValidatorAddress(value);
+      msg.setSourceChannel(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readUint64String());
-      msg.setAmount(value);
+      var value = new proto.OsmosisToken;
+      reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
+      msg.setToken(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setSender(value);
+      break;
+    case 5:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReceiver(value);
+      break;
+    case 6:
+      var value = new proto.OsmosisTimeoutHeight;
+      reader.readMessage(value,proto.OsmosisTimeoutHeight.deserializeBinaryFromReader);
+      msg.setTimeoutHeight(value);
       break;
     default:
       reader.skipField();
@@ -4612,9 +4548,9 @@ proto.OsmosisMsgClaim.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisMsgClaim.prototype.serializeBinary = function() {
+proto.OsmosisMsgIBCDeposit.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisMsgClaim.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgIBCDeposit.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4622,11 +4558,11 @@ proto.OsmosisMsgClaim.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisMsgClaim} message
+ * @param {!proto.OsmosisMsgIBCDeposit} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgClaim.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgIBCDeposit.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -4642,39 +4578,62 @@ proto.OsmosisMsgClaim.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
+  f = message.getToken();
   if (f != null) {
-    writer.writeUint64String(
+    writer.writeMessage(
       3,
+      f,
+      proto.OsmosisToken.serializeBinaryToWriter
+    );
+  }
+  f = /** @type {string} */ (jspb.Message.getField(message, 4));
+  if (f != null) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
+  f = /** @type {string} */ (jspb.Message.getField(message, 5));
+  if (f != null) {
+    writer.writeString(
+      5,
       f
     );
   }
+  f = message.getTimeoutHeight();
+  if (f != null) {
+    writer.writeMessage(
+      6,
+      f,
+      proto.OsmosisTimeoutHeight.serializeBinaryToWriter
+    );
+  }
 };
 
 
 /**
- * optional string delegator_address = 1;
+ * optional string source_port = 1;
  * @return {string}
  */
-proto.OsmosisMsgClaim.prototype.getDelegatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.getSourcePort = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.setDelegatorAddress = function(value) {
+proto.OsmosisMsgIBCDeposit.prototype.setSourcePort = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.clearDelegatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.clearSourcePort = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -4683,34 +4642,34 @@ proto.OsmosisMsgClaim.prototype.clearDelegatorAddress = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgClaim.prototype.hasDelegatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.hasSourcePort = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional string validator_address = 2;
+ * optional string source_channel = 2;
  * @return {string}
  */
-proto.OsmosisMsgClaim.prototype.getValidatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.getSourceChannel = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.setValidatorAddress = function(value) {
+proto.OsmosisMsgIBCDeposit.prototype.setSourceChannel = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.clearValidatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.clearSourceChannel = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -4719,35 +4678,72 @@ proto.OsmosisMsgClaim.prototype.clearValidatorAddress = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgClaim.prototype.hasValidatorAddress = function() {
+proto.OsmosisMsgIBCDeposit.prototype.hasSourceChannel = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional uint64 amount = 3;
+ * optional OsmosisToken token = 3;
+ * @return {?proto.OsmosisToken}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.getToken = function() {
+  return /** @type{?proto.OsmosisToken} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
+};
+
+
+/**
+ * @param {?proto.OsmosisToken|undefined} value
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+*/
+proto.OsmosisMsgIBCDeposit.prototype.setToken = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+ */
+proto.OsmosisMsgIBCDeposit.prototype.clearToken = function() {
+  return this.setToken(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.hasToken = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional string sender = 4;
  * @return {string}
  */
-proto.OsmosisMsgClaim.prototype.getAmount = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "0"));
+proto.OsmosisMsgIBCDeposit.prototype.getSender = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.setAmount = function(value) {
-  return jspb.Message.setField(this, 3, value);
+proto.OsmosisMsgIBCDeposit.prototype.setSender = function(value) {
+  return jspb.Message.setField(this, 4, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgClaim} returns this
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
  */
-proto.OsmosisMsgClaim.prototype.clearAmount = function() {
-  return jspb.Message.setField(this, 3, undefined);
+proto.OsmosisMsgIBCDeposit.prototype.clearSender = function() {
+  return jspb.Message.setField(this, 4, undefined);
 };
 
 
@@ -4755,8 +4751,81 @@ proto.OsmosisMsgClaim.prototype.clearAmount = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgClaim.prototype.hasAmount = function() {
-  return jspb.Message.getField(this, 3) != null;
+proto.OsmosisMsgIBCDeposit.prototype.hasSender = function() {
+  return jspb.Message.getField(this, 4) != null;
+};
+
+
+/**
+ * optional string receiver = 5;
+ * @return {string}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.getReceiver = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+ */
+proto.OsmosisMsgIBCDeposit.prototype.setReceiver = function(value) {
+  return jspb.Message.setField(this, 5, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+ */
+proto.OsmosisMsgIBCDeposit.prototype.clearReceiver = function() {
+  return jspb.Message.setField(this, 5, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.hasReceiver = function() {
+  return jspb.Message.getField(this, 5) != null;
+};
+
+
+/**
+ * optional OsmosisTimeoutHeight timeout_height = 6;
+ * @return {?proto.OsmosisTimeoutHeight}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.getTimeoutHeight = function() {
+  return /** @type{?proto.OsmosisTimeoutHeight} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisTimeoutHeight, 6));
+};
+
+
+/**
+ * @param {?proto.OsmosisTimeoutHeight|undefined} value
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+*/
+proto.OsmosisMsgIBCDeposit.prototype.setTimeoutHeight = function(value) {
+  return jspb.Message.setWrapperField(this, 6, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgIBCDeposit} returns this
+ */
+proto.OsmosisMsgIBCDeposit.prototype.clearTimeoutHeight = function() {
+  return this.setTimeoutHeight(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgIBCDeposit.prototype.hasTimeoutHeight = function() {
+  return jspb.Message.getField(this, 6) != null;
 };
 
 
@@ -4776,8 +4845,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisMsgSwap.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisMsgSwap.toObject(opt_includeInstance, this);
+proto.OsmosisMsgIBCWithdrawal.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgIBCWithdrawal.toObject(opt_includeInstance, this);
 };
 
 
@@ -4786,18 +4855,18 @@ proto.OsmosisMsgSwap.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisMsgSwap} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgIBCWithdrawal} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgSwap.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgIBCWithdrawal.toObject = function(includeInstance, msg) {
   var f, obj = {
-    senderAddress: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    poolId: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    tokenOutDenom: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
-    tokenInDenom: (f = jspb.Message.getField(msg, 4)) == null ? undefined : f,
-    amount: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f,
-    tokenOutMinAmount: (f = jspb.Message.getField(msg, 6)) == null ? undefined : f
+    sourcePort: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    sourceChannel: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f),
+    sender: (f = jspb.Message.getField(msg, 4)) == null ? undefined : f,
+    receiver: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f,
+    timeoutHeight: (f = msg.getTimeoutHeight()) && proto.OsmosisTimeoutHeight.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -4811,23 +4880,23 @@ proto.OsmosisMsgSwap.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisMsgSwap}
+ * @return {!proto.OsmosisMsgIBCWithdrawal}
  */
-proto.OsmosisMsgSwap.deserializeBinary = function(bytes) {
+proto.OsmosisMsgIBCWithdrawal.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisMsgSwap;
-  return proto.OsmosisMsgSwap.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgIBCWithdrawal;
+  return proto.OsmosisMsgIBCWithdrawal.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisMsgSwap} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgIBCWithdrawal} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisMsgSwap}
+ * @return {!proto.OsmosisMsgIBCWithdrawal}
  */
-proto.OsmosisMsgSwap.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgIBCWithdrawal.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -4836,27 +4905,29 @@ proto.OsmosisMsgSwap.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setSenderAddress(value);
+      msg.setSourcePort(value);
       break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPoolId(value);
+      msg.setSourceChannel(value);
       break;
     case 3:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setTokenOutDenom(value);
+      var value = new proto.OsmosisToken;
+      reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
+      msg.setToken(value);
       break;
     case 4:
       var value = /** @type {string} */ (reader.readString());
-      msg.setTokenInDenom(value);
+      msg.setSender(value);
       break;
     case 5:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setAmount(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setReceiver(value);
       break;
     case 6:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setTokenOutMinAmount(value);
+      var value = new proto.OsmosisTimeoutHeight;
+      reader.readMessage(value,proto.OsmosisTimeoutHeight.deserializeBinaryFromReader);
+      msg.setTimeoutHeight(value);
       break;
     default:
       reader.skipField();
@@ -4871,9 +4942,9 @@ proto.OsmosisMsgSwap.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisMsgSwap.prototype.serializeBinary = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisMsgSwap.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgIBCWithdrawal.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -4881,11 +4952,11 @@ proto.OsmosisMsgSwap.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisMsgSwap} message
+ * @param {!proto.OsmosisMsgIBCWithdrawal} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgSwap.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgIBCWithdrawal.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -4901,11 +4972,12 @@ proto.OsmosisMsgSwap.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
+  f = message.getToken();
   if (f != null) {
-    writer.writeString(
+    writer.writeMessage(
       3,
-      f
+      f,
+      proto.OsmosisToken.serializeBinaryToWriter
     );
   }
   f = /** @type {string} */ (jspb.Message.getField(message, 4));
@@ -4915,46 +4987,47 @@ proto.OsmosisMsgSwap.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {number} */ (jspb.Message.getField(message, 5));
+  f = /** @type {string} */ (jspb.Message.getField(message, 5));
   if (f != null) {
-    writer.writeUint64(
+    writer.writeString(
       5,
       f
     );
   }
-  f = /** @type {number} */ (jspb.Message.getField(message, 6));
+  f = message.getTimeoutHeight();
   if (f != null) {
-    writer.writeUint64(
+    writer.writeMessage(
       6,
-      f
+      f,
+      proto.OsmosisTimeoutHeight.serializeBinaryToWriter
     );
   }
 };
 
 
 /**
- * optional string sender_address = 1;
+ * optional string source_port = 1;
  * @return {string}
  */
-proto.OsmosisMsgSwap.prototype.getSenderAddress = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.getSourcePort = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.setSenderAddress = function(value) {
+proto.OsmosisMsgIBCWithdrawal.prototype.setSourcePort = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearSenderAddress = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.clearSourcePort = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -4963,34 +5036,34 @@ proto.OsmosisMsgSwap.prototype.clearSenderAddress = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasSenderAddress = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasSourcePort = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional string pool_id = 2;
+ * optional string source_channel = 2;
  * @return {string}
  */
-proto.OsmosisMsgSwap.prototype.getPoolId = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.getSourceChannel = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.setPoolId = function(value) {
+proto.OsmosisMsgIBCWithdrawal.prototype.setSourceChannel = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearPoolId = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.clearSourceChannel = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -4999,35 +5072,36 @@ proto.OsmosisMsgSwap.prototype.clearPoolId = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasPoolId = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasSourceChannel = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional string token_out_denom = 3;
- * @return {string}
+ * optional OsmosisToken token = 3;
+ * @return {?proto.OsmosisToken}
  */
-proto.OsmosisMsgSwap.prototype.getTokenOutDenom = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+proto.OsmosisMsgIBCWithdrawal.prototype.getToken = function() {
+  return /** @type{?proto.OsmosisToken} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
 };
 
 
 /**
- * @param {string} value
- * @return {!proto.OsmosisMsgSwap} returns this
- */
-proto.OsmosisMsgSwap.prototype.setTokenOutDenom = function(value) {
-  return jspb.Message.setField(this, 3, value);
+ * @param {?proto.OsmosisToken|undefined} value
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
+*/
+proto.OsmosisMsgIBCWithdrawal.prototype.setToken = function(value) {
+  return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
 /**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearTokenOutDenom = function() {
-  return jspb.Message.setField(this, 3, undefined);
+proto.OsmosisMsgIBCWithdrawal.prototype.clearToken = function() {
+  return this.setToken(undefined);
 };
 
 
@@ -5035,34 +5109,34 @@ proto.OsmosisMsgSwap.prototype.clearTokenOutDenom = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasTokenOutDenom = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasToken = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
- * optional string token_in_denom = 4;
+ * optional string sender = 4;
  * @return {string}
  */
-proto.OsmosisMsgSwap.prototype.getTokenInDenom = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.getSender = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.setTokenInDenom = function(value) {
+proto.OsmosisMsgIBCWithdrawal.prototype.setSender = function(value) {
   return jspb.Message.setField(this, 4, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearTokenInDenom = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.clearSender = function() {
   return jspb.Message.setField(this, 4, undefined);
 };
 
@@ -5071,34 +5145,34 @@ proto.OsmosisMsgSwap.prototype.clearTokenInDenom = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasTokenInDenom = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasSender = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
- * optional uint64 amount = 5;
- * @return {number}
+ * optional string receiver = 5;
+ * @return {string}
  */
-proto.OsmosisMsgSwap.prototype.getAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+proto.OsmosisMsgIBCWithdrawal.prototype.getReceiver = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /**
- * @param {number} value
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @param {string} value
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.setAmount = function(value) {
+proto.OsmosisMsgIBCWithdrawal.prototype.setReceiver = function(value) {
   return jspb.Message.setField(this, 5, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearAmount = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.clearReceiver = function() {
   return jspb.Message.setField(this, 5, undefined);
 };
 
@@ -5107,35 +5181,36 @@ proto.OsmosisMsgSwap.prototype.clearAmount = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasAmount = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasReceiver = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
 
 /**
- * optional uint64 token_out_min_amount = 6;
- * @return {number}
+ * optional OsmosisTimeoutHeight timeout_height = 6;
+ * @return {?proto.OsmosisTimeoutHeight}
  */
-proto.OsmosisMsgSwap.prototype.getTokenOutMinAmount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
+proto.OsmosisMsgIBCWithdrawal.prototype.getTimeoutHeight = function() {
+  return /** @type{?proto.OsmosisTimeoutHeight} */ (
+    jspb.Message.getWrapperField(this, proto.OsmosisTimeoutHeight, 6));
 };
 
 
 /**
- * @param {number} value
- * @return {!proto.OsmosisMsgSwap} returns this
- */
-proto.OsmosisMsgSwap.prototype.setTokenOutMinAmount = function(value) {
-  return jspb.Message.setField(this, 6, value);
+ * @param {?proto.OsmosisTimeoutHeight|undefined} value
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
+*/
+proto.OsmosisMsgIBCWithdrawal.prototype.setTimeoutHeight = function(value) {
+  return jspb.Message.setWrapperField(this, 6, value);
 };
 
 
 /**
- * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgSwap} returns this
+ * Clears the message field making it undefined.
+ * @return {!proto.OsmosisMsgIBCWithdrawal} returns this
  */
-proto.OsmosisMsgSwap.prototype.clearTokenOutMinAmount = function() {
-  return jspb.Message.setField(this, 6, undefined);
+proto.OsmosisMsgIBCWithdrawal.prototype.clearTimeoutHeight = function() {
+  return this.setTimeoutHeight(undefined);
 };
 
 
@@ -5143,7 +5218,7 @@ proto.OsmosisMsgSwap.prototype.clearTokenOutMinAmount = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgSwap.prototype.hasTokenOutMinAmount = function() {
+proto.OsmosisMsgIBCWithdrawal.prototype.hasTimeoutHeight = function() {
   return jspb.Message.getField(this, 6) != null;
 };
 
@@ -5164,8 +5239,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.OsmosisMsgFarmTokens.prototype.toObject = function(opt_includeInstance) {
-  return proto.OsmosisMsgFarmTokens.toObject(opt_includeInstance, this);
+proto.OsmosisMsgSwap.prototype.toObject = function(opt_includeInstance) {
+  return proto.OsmosisMsgSwap.toObject(opt_includeInstance, this);
 };
 
 
@@ -5174,15 +5249,17 @@ proto.OsmosisMsgFarmTokens.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.OsmosisMsgFarmTokens} msg The msg instance to transform.
+ * @param {!proto.OsmosisMsgSwap} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgFarmTokens.toObject = function(includeInstance, msg) {
+proto.OsmosisMsgSwap.toObject = function(includeInstance, msg) {
   var f, obj = {
-    owner: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
-    duration: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
-    token: (f = msg.getToken()) && proto.OsmosisToken.toObject(includeInstance, f)
+    sender: (f = jspb.Message.getField(msg, 1)) == null ? undefined : f,
+    poolId: (f = jspb.Message.getField(msg, 2)) == null ? undefined : f,
+    tokenOutDenom: (f = jspb.Message.getField(msg, 3)) == null ? undefined : f,
+    tokenIn: (f = msg.getTokenIn()) && proto.OsmosisToken.toObject(includeInstance, f),
+    tokenOutMinAmount: (f = jspb.Message.getField(msg, 5)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -5196,23 +5273,23 @@ proto.OsmosisMsgFarmTokens.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.OsmosisMsgFarmTokens}
+ * @return {!proto.OsmosisMsgSwap}
  */
-proto.OsmosisMsgFarmTokens.deserializeBinary = function(bytes) {
+proto.OsmosisMsgSwap.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.OsmosisMsgFarmTokens;
-  return proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.OsmosisMsgSwap;
+  return proto.OsmosisMsgSwap.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.OsmosisMsgFarmTokens} msg The message object to deserialize into.
+ * @param {!proto.OsmosisMsgSwap} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.OsmosisMsgFarmTokens}
+ * @return {!proto.OsmosisMsgSwap}
  */
-proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader = function(msg, reader) {
+proto.OsmosisMsgSwap.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -5221,16 +5298,24 @@ proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader = function(msg, reader) {
     switch (field) {
     case 1:
       var value = /** @type {string} */ (reader.readString());
-      msg.setOwner(value);
+      msg.setSender(value);
       break;
     case 2:
-      var value = /** @type {number} */ (reader.readUint64());
-      msg.setDuration(value);
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPoolId(value);
       break;
     case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTokenOutDenom(value);
+      break;
+    case 4:
       var value = new proto.OsmosisToken;
       reader.readMessage(value,proto.OsmosisToken.deserializeBinaryFromReader);
-      msg.setToken(value);
+      msg.setTokenIn(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readUint64());
+      msg.setTokenOutMinAmount(value);
       break;
     default:
       reader.skipField();
@@ -5245,9 +5330,9 @@ proto.OsmosisMsgFarmTokens.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.OsmosisMsgFarmTokens.prototype.serializeBinary = function() {
+proto.OsmosisMsgSwap.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.OsmosisMsgFarmTokens.serializeBinaryToWriter(this, writer);
+  proto.OsmosisMsgSwap.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -5255,11 +5340,11 @@ proto.OsmosisMsgFarmTokens.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.OsmosisMsgFarmTokens} message
+ * @param {!proto.OsmosisMsgSwap} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.OsmosisMsgFarmTokens.serializeBinaryToWriter = function(message, writer) {
+proto.OsmosisMsgSwap.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = /** @type {string} */ (jspb.Message.getField(message, 1));
   if (f != null) {
@@ -5268,47 +5353,61 @@ proto.OsmosisMsgFarmTokens.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = /** @type {number} */ (jspb.Message.getField(message, 2));
+  f = /** @type {string} */ (jspb.Message.getField(message, 2));
   if (f != null) {
-    writer.writeUint64(
+    writer.writeString(
       2,
       f
     );
   }
-  f = message.getToken();
+  f = /** @type {string} */ (jspb.Message.getField(message, 3));
   if (f != null) {
-    writer.writeMessage(
+    writer.writeString(
       3,
+      f
+    );
+  }
+  f = message.getTokenIn();
+  if (f != null) {
+    writer.writeMessage(
+      4,
       f,
       proto.OsmosisToken.serializeBinaryToWriter
     );
   }
+  f = /** @type {number} */ (jspb.Message.getField(message, 5));
+  if (f != null) {
+    writer.writeUint64(
+      5,
+      f
+    );
+  }
 };
 
 
 /**
- * optional string owner = 1;
+ * optional string sender = 1;
  * @return {string}
  */
-proto.OsmosisMsgFarmTokens.prototype.getOwner = function() {
+proto.OsmosisMsgSwap.prototype.getSender = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @return {!proto.OsmosisMsgSwap} returns this
  */
-proto.OsmosisMsgFarmTokens.prototype.setOwner = function(value) {
+proto.OsmosisMsgSwap.prototype.setSender = function(value) {
   return jspb.Message.setField(this, 1, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @return {!proto.OsmosisMsgSwap} returns this
  */
-proto.OsmosisMsgFarmTokens.prototype.clearOwner = function() {
+proto.OsmosisMsgSwap.prototype.clearSender = function() {
   return jspb.Message.setField(this, 1, undefined);
 };
 
@@ -5317,34 +5416,34 @@ proto.OsmosisMsgFarmTokens.prototype.clearOwner = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgFarmTokens.prototype.hasOwner = function() {
+proto.OsmosisMsgSwap.prototype.hasSender = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
- * optional uint64 duration = 2;
- * @return {number}
+ * optional string pool_id = 2;
+ * @return {string}
  */
-proto.OsmosisMsgFarmTokens.prototype.getDuration = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.OsmosisMsgSwap.prototype.getPoolId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
 /**
- * @param {number} value
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @param {string} value
+ * @return {!proto.OsmosisMsgSwap} returns this
  */
-proto.OsmosisMsgFarmTokens.prototype.setDuration = function(value) {
+proto.OsmosisMsgSwap.prototype.setPoolId = function(value) {
   return jspb.Message.setField(this, 2, value);
 };
 
 
 /**
  * Clears the field making it undefined.
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @return {!proto.OsmosisMsgSwap} returns this
  */
-proto.OsmosisMsgFarmTokens.prototype.clearDuration = function() {
+proto.OsmosisMsgSwap.prototype.clearPoolId = function() {
   return jspb.Message.setField(this, 2, undefined);
 };
 
@@ -5353,36 +5452,72 @@ proto.OsmosisMsgFarmTokens.prototype.clearDuration = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgFarmTokens.prototype.hasDuration = function() {
+proto.OsmosisMsgSwap.prototype.hasPoolId = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional OsmosisToken token = 3;
+ * optional string token_out_denom = 3;
+ * @return {string}
+ */
+proto.OsmosisMsgSwap.prototype.getTokenOutDenom = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.OsmosisMsgSwap} returns this
+ */
+proto.OsmosisMsgSwap.prototype.setTokenOutDenom = function(value) {
+  return jspb.Message.setField(this, 3, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.OsmosisMsgSwap} returns this
+ */
+proto.OsmosisMsgSwap.prototype.clearTokenOutDenom = function() {
+  return jspb.Message.setField(this, 3, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgSwap.prototype.hasTokenOutDenom = function() {
+  return jspb.Message.getField(this, 3) != null;
+};
+
+
+/**
+ * optional OsmosisToken token_in = 4;
  * @return {?proto.OsmosisToken}
  */
-proto.OsmosisMsgFarmTokens.prototype.getToken = function() {
+proto.OsmosisMsgSwap.prototype.getTokenIn = function() {
   return /** @type{?proto.OsmosisToken} */ (
-    jspb.Message.getWrapperField(this, proto.OsmosisToken, 3));
+    jspb.Message.getWrapperField(this, proto.OsmosisToken, 4));
 };
 
 
 /**
  * @param {?proto.OsmosisToken|undefined} value
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @return {!proto.OsmosisMsgSwap} returns this
 */
-proto.OsmosisMsgFarmTokens.prototype.setToken = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+proto.OsmosisMsgSwap.prototype.setTokenIn = function(value) {
+  return jspb.Message.setWrapperField(this, 4, value);
 };
 
 
 /**
  * Clears the message field making it undefined.
- * @return {!proto.OsmosisMsgFarmTokens} returns this
+ * @return {!proto.OsmosisMsgSwap} returns this
  */
-proto.OsmosisMsgFarmTokens.prototype.clearToken = function() {
-  return this.setToken(undefined);
+proto.OsmosisMsgSwap.prototype.clearTokenIn = function() {
+  return this.setTokenIn(undefined);
 };
 
 
@@ -5390,8 +5525,44 @@ proto.OsmosisMsgFarmTokens.prototype.clearToken = function() {
  * Returns whether this field is set.
  * @return {boolean}
  */
-proto.OsmosisMsgFarmTokens.prototype.hasToken = function() {
-  return jspb.Message.getField(this, 3) != null;
+proto.OsmosisMsgSwap.prototype.hasTokenIn = function() {
+  return jspb.Message.getField(this, 4) != null;
+};
+
+
+/**
+ * optional uint64 token_out_min_amount = 5;
+ * @return {number}
+ */
+proto.OsmosisMsgSwap.prototype.getTokenOutMinAmount = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.OsmosisMsgSwap} returns this
+ */
+proto.OsmosisMsgSwap.prototype.setTokenOutMinAmount = function(value) {
+  return jspb.Message.setField(this, 5, value);
+};
+
+
+/**
+ * Clears the field making it undefined.
+ * @return {!proto.OsmosisMsgSwap} returns this
+ */
+proto.OsmosisMsgSwap.prototype.clearTokenOutMinAmount = function() {
+  return jspb.Message.setField(this, 5, undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.OsmosisMsgSwap.prototype.hasTokenOutMinAmount = function() {
+  return jspb.Message.getField(this, 5) != null;
 };