diff --git a/auctioneer/account_subscription.go b/auctioneer/account_subscription.go
index dd2604c..ad87ce7 100644
--- a/auctioneer/account_subscription.go
+++ b/auctioneer/account_subscription.go
@@ -78,7 +78,7 @@ func (s *acctSubscription) authenticate(ctx context.Context) error {
 		return s.sendMsg(&clmrpc.ClientAuctionMessage{
 			Msg: &clmrpc.ClientAuctionMessage_Subscribe{
 				Subscribe: &clmrpc.AccountSubscription{
-					UserSubKey:  acctPubKey[:],
+					TraderKey:   acctPubKey[:],
 					CommitNonce: nonce[:],
 					AuthSig:     sig,
 				},
diff --git a/auctioneer/client.go b/auctioneer/client.go
index 5cc2225..69f70c6 100644
--- a/auctioneer/client.go
+++ b/auctioneer/client.go
@@ -236,9 +236,9 @@ func (c *Client) InitAccount(ctx context.Context, account *account.Account) erro
 			OutputIndex: account.OutPoint.Index,
 		},
 		AccountScript: accountOutput.PkScript,
-		AccountValue:  uint32(account.Value),
+		AccountValue:  uint64(account.Value),
 		AccountExpiry: account.Expiry,
-		UserSubKey:    account.TraderKey.PubKey.SerializeCompressed(),
+		TraderKey:     account.TraderKey.PubKey.SerializeCompressed(),
 	})
 	return err
 }
@@ -269,7 +269,7 @@ func (c *Client) ModifyAccount(ctx context.Context, account *account.Account,
 	rpcOutputs := make([]*clmrpc.ServerOutput, 0, len(outputs))
 	for _, output := range outputs {
 		rpcOutputs = append(rpcOutputs, &clmrpc.ServerOutput{
-			Value:  uint32(output.Value),
+			Value:  uint64(output.Value),
 			Script: output.PkScript,
 		})
 	}
@@ -278,12 +278,12 @@ func (c *Client) ModifyAccount(ctx context.Context, account *account.Account,
 	modifiedAccount := account.Copy(modifiers...)
 	if len(modifiers) > 0 {
 		rpcNewParams = &clmrpc.ServerModifyAccountRequest_NewAccountParameters{
-			Value: uint32(modifiedAccount.Value),
+			Value: uint64(modifiedAccount.Value),
 		}
 	}
 
 	resp, err := c.client.ModifyAccount(ctx, &clmrpc.ServerModifyAccountRequest{
-		UserSubKey: account.TraderKey.PubKey.SerializeCompressed(),
+		TraderKey:  account.TraderKey.PubKey.SerializeCompressed(),
 		NewInputs:  rpcInputs,
 		NewOutputs: rpcOutputs,
 		NewParams:  rpcNewParams,
@@ -311,15 +311,15 @@ func (c *Client) SubmitOrder(ctx context.Context, o order.Order,
 		})
 	}
 	details := &clmrpc.ServerOrder{
-		UserSubKey:             o.Details().AcctKey[:],
-		RateFixed:              int64(o.Details().FixedRate),
-		Amt:                    int64(o.Details().Amt),
+		TraderKey:              o.Details().AcctKey[:],
+		RateFixed:              o.Details().FixedRate,
+		Amt:                    uint64(o.Details().Amt),
 		OrderNonce:             nonce[:],
 		OrderSig:               serverParams.RawSig,
 		MultiSigKey:            serverParams.MultiSigKey[:],
 		NodePub:                serverParams.NodePubkey[:],
 		NodeAddr:               nodeAddrs,
-		FundingFeeRateSatPerKw: int64(o.Details().FundingFeeRate),
+		FundingFeeRateSatPerKw: uint64(o.Details().FundingFeeRate),
 	}
 
 	// Split into server message which is type specific.
@@ -327,7 +327,7 @@ func (c *Client) SubmitOrder(ctx context.Context, o order.Order,
 	case *order.Ask:
 		serverAsk := &clmrpc.ServerAsk{
 			Details:           details,
-			MaxDurationBlocks: int64(castOrder.MaxDuration),
+			MaxDurationBlocks: castOrder.MaxDuration,
 			Version:           uint32(castOrder.Version),
 		}
 		rpcRequest.Details = &clmrpc.ServerSubmitOrderRequest_Ask{
@@ -337,7 +337,7 @@ func (c *Client) SubmitOrder(ctx context.Context, o order.Order,
 	case *order.Bid:
 		serverBid := &clmrpc.ServerBid{
 			Details:           details,
-			MinDurationBlocks: int64(castOrder.MinDuration),
+			MinDurationBlocks: castOrder.MinDuration,
 			Version:           uint32(castOrder.Version),
 		}
 		rpcRequest.Details = &clmrpc.ServerSubmitOrderRequest_Bid{
diff --git a/clmrpc/auctioneer.pb.go b/clmrpc/auctioneer.pb.go
index e042484..335e00c 100644
--- a/clmrpc/auctioneer.pb.go
+++ b/clmrpc/auctioneer.pb.go
@@ -66,13 +66,13 @@ func (OrderState) EnumDescriptor() ([]byte, []int) {
 type OrderMatchReject_RejectReason int32
 
 const (
-	/// The reason cannot be mapped to a specific code.
+	// The reason cannot be mapped to a specific code.
 	OrderMatchReject_UNKNOWN OrderMatchReject_RejectReason = 0
-	//*
+	//
 	//The client didn't come up with the same result as the server and is
 	//rejecting the batch because of that.
 	OrderMatchReject_SERVER_MISBEHAVIOR OrderMatchReject_RejectReason = 1
-	//*
+	//
 	//The client doesn't support the current batch verification version the
 	//server is using.
 	OrderMatchReject_BATCH_VERSION_MISMATCH OrderMatchReject_RejectReason = 2
@@ -101,10 +101,10 @@ func (OrderMatchReject_RejectReason) EnumDescriptor() ([]byte, []int) {
 type SubscribeError_Error int32
 
 const (
-	//*
+	//
 	//The error cannot be mapped to a specific code.
 	SubscribeError_UNKNOWN SubscribeError_Error = 0
-	//*
+	//
 	//The server is shutting down for maintenance. Traders should close the
 	//long-lived stream/connection and try to connect again after some time.
 	SubscribeError_SERVER_SHUTDOWN SubscribeError_Error = 1
@@ -269,24 +269,24 @@ func (m *ReserveAccountResponse) GetInitialBatchKey() []byte {
 }
 
 type ServerInitAccountRequest struct {
-	//*
+	//
 	//Transaction output of the account. Has to be unspent and be a P2WSH of
 	//the account script below. The amount must also exactly correspond to the
 	//account value below.
 	AccountPoint *OutPoint `protobuf:"bytes,1,opt,name=account_point,json=accountPoint,proto3" json:"account_point,omitempty"`
-	//*
+	//
 	//The script used to create the account point.
 	AccountScript []byte `protobuf:"bytes,2,opt,name=account_script,json=accountScript,proto3" json:"account_script,omitempty"`
-	//*
+	//
 	//The value of the account in satoshis. Must match the amount of the
 	//account_point output.
-	AccountValue uint32 `protobuf:"varint,3,opt,name=account_value,json=accountValue,proto3" json:"account_value,omitempty"`
-	//*
+	AccountValue uint64 `protobuf:"varint,3,opt,name=account_value,json=accountValue,proto3" json:"account_value,omitempty"`
+	//
 	//The block height at which the account should expire.
 	AccountExpiry uint32 `protobuf:"varint,4,opt,name=account_expiry,json=accountExpiry,proto3" json:"account_expiry,omitempty"`
-	//*
-	//The user's sub account key.
-	UserSubKey           []byte   `protobuf:"bytes,5,opt,name=user_sub_key,json=userSubKey,proto3" json:"user_sub_key,omitempty"`
+	//
+	//The trader's account key.
+	TraderKey            []byte   `protobuf:"bytes,5,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -331,7 +331,7 @@ func (m *ServerInitAccountRequest) GetAccountScript() []byte {
 	return nil
 }
 
-func (m *ServerInitAccountRequest) GetAccountValue() uint32 {
+func (m *ServerInitAccountRequest) GetAccountValue() uint64 {
 	if m != nil {
 		return m.AccountValue
 	}
@@ -345,9 +345,9 @@ func (m *ServerInitAccountRequest) GetAccountExpiry() uint32 {
 	return 0
 }
 
-func (m *ServerInitAccountRequest) GetUserSubKey() []byte {
+func (m *ServerInitAccountRequest) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
@@ -544,7 +544,7 @@ func (*ServerSubmitOrderResponse) XXX_OneofWrappers() []interface{} {
 }
 
 type ServerCancelOrderRequest struct {
-	//*
+	//
 	//The order's unique 32 byte identifier.
 	OrderNonce           []byte   `protobuf:"bytes,1,opt,name=order_nonce,json=orderNonce,proto3" json:"order_nonce,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -741,11 +741,11 @@ func (*ClientAuctionMessage) XXX_OneofWrappers() []interface{} {
 }
 
 type AccountCommitment struct {
-	//*
-	//The SHA256 hash of the user's account sub key and a 32 byte random nonce.
+	//
+	//The SHA256 hash of the trader's account key and a 32 byte random nonce.
 	//commit_hash = SHA256(accountPubKey || nonce)
 	CommitHash []byte `protobuf:"bytes,1,opt,name=commit_hash,json=commitHash,proto3" json:"commit_hash,omitempty"`
-	//*
+	//
 	//The batch verification protocol version the client is using. Clients that
 	//don't use the latest version will be declined to connect and participate in
 	//an auction. The user should then be informed that a software update is
@@ -796,15 +796,15 @@ func (m *AccountCommitment) GetBatchVersion() uint32 {
 }
 
 type AccountSubscription struct {
-	//*
-	//The user's sub account key of the account to subscribe to.
-	UserSubKey []byte `protobuf:"bytes,1,opt,name=user_sub_key,json=userSubKey,proto3" json:"user_sub_key,omitempty"`
-	//*
+	//
+	//The trader's account key of the account to subscribe to.
+	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
+	//
 	//The random 32 byte nonce the trader used to create the commitment hash.
 	CommitNonce []byte `protobuf:"bytes,2,opt,name=commit_nonce,json=commitNonce,proto3" json:"commit_nonce,omitempty"`
-	//*
+	//
 	//The signature over the auth_hash which is the hash of the commitment and
-	//challenge. The signature is created with the user's sub account key they
+	//challenge. The signature is created with the trader's account key they
 	//committed to.
 	//auth_hash = SHA256(SHA256(accountPubKey || nonce) || challenge)
 	AuthSig              []byte   `protobuf:"bytes,3,opt,name=auth_sig,json=authSig,proto3" json:"auth_sig,omitempty"`
@@ -838,9 +838,9 @@ func (m *AccountSubscription) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_AccountSubscription proto.InternalMessageInfo
 
-func (m *AccountSubscription) GetUserSubKey() []byte {
+func (m *AccountSubscription) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
@@ -860,13 +860,13 @@ func (m *AccountSubscription) GetAuthSig() []byte {
 }
 
 type OrderMatchAccept struct {
-	//*
+	//
 	//A list of all order nonces of the orders that are accepted by the trader to
 	//be matched by the auctioneer. Orders that didn't have all their units
 	//fulfilled need to be tracked by the trader locally by applying all diffs
 	//resulting from an executed batch.
 	OrderNonce [][]byte `protobuf:"bytes,1,rep,name=order_nonce,json=orderNonce,proto3" json:"order_nonce,omitempty"`
-	//*
+	//
 	//The batch ID this acceptance message refers to. Must be set to avoid out-of-
 	//order responses from disrupting the batching process.
 	BatchId              []byte   `protobuf:"bytes,2,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
@@ -915,13 +915,13 @@ func (m *OrderMatchAccept) GetBatchId() []byte {
 }
 
 type OrderMatchReject struct {
-	//*
+	//
 	//The ID of the batch to reject.
 	BatchId []byte `protobuf:"bytes,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
-	//*
+	//
 	//The reason/error string for the rejection.
 	Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"`
-	//*
+	//
 	//The reason as a code.
 	ReasonCode           OrderMatchReject_RejectReason `protobuf:"varint,3,opt,name=reason_code,json=reasonCode,proto3,enum=clmrpc.OrderMatchReject_RejectReason" json:"reason_code,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
@@ -976,14 +976,14 @@ func (m *OrderMatchReject) GetReasonCode() OrderMatchReject_RejectReason {
 }
 
 type OrderMatchSign struct {
-	//*
+	//
 	//The ID of the batch that the signatures are meant for.
 	BatchId []byte `protobuf:"bytes,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
-	//*
+	//
 	//A map with the signatures to spend the accounts being spent in a batch
-	//transaction. The map key corresponds to the user's sub key of the account
-	//in the batch transaction. The account key/ID has to be hex encoded into a
-	//string because protobuf doesn't allow bytes as a map key data type.
+	//transaction. The map key corresponds to the trader's account key of the
+	//account in the batch transaction. The account key/ID has to be hex encoded
+	//into a string because protobuf doesn't allow bytes as a map key data type.
 	AccountSigs          map[string][]byte `protobuf:"bytes,2,rep,name=account_sigs,json=accountSigs,proto3" json:"account_sigs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
@@ -1155,11 +1155,11 @@ func (*ServerAuctionMessage) XXX_OneofWrappers() []interface{} {
 }
 
 type ServerChallenge struct {
-	//*
-	//The unique challenge for each stream that has to be signed with the user's
-	//sub key for each account subscription.
+	//
+	//The unique challenge for each stream that has to be signed with the trader's
+	//account key for each account subscription.
 	Challenge []byte `protobuf:"bytes,1,opt,name=challenge,proto3" json:"challenge,omitempty"`
-	//*
+	//
 	//The commit hash the challenge was created for.
 	CommitHash           []byte   `protobuf:"bytes,2,opt,name=commit_hash,json=commitHash,proto3" json:"commit_hash,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1207,38 +1207,38 @@ func (m *ServerChallenge) GetCommitHash() []byte {
 }
 
 type OrderMatchPrepare struct {
-	//*
+	//
 	//Maps a user's own order_nonce to the opposite order type they were matched
 	//with. The order_nonce is a 32 byte hex encoded string because bytes is not
 	//allowed as a map key data type in protobuf.
 	MatchedOrders map[string]*MatchedOrder `protobuf:"bytes,1,rep,name=matched_orders,json=matchedOrders,proto3" json:"matched_orders,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	//*
+	//
 	//The uniform clearing price rate in parts per million that was used for this
 	//batch.
 	ClearingPriceRate uint32 `protobuf:"varint,2,opt,name=clearing_price_rate,json=clearingPriceRate,proto3" json:"clearing_price_rate,omitempty"`
-	//*
+	//
 	//A list of the user's own accounts that are being spent by the matched
 	//orders. The list contains the differences that would be applied by the
 	//server when executing the orders.
 	ChargedAccounts []*AccountDiff `protobuf:"bytes,3,rep,name=charged_accounts,json=chargedAccounts,proto3" json:"charged_accounts,omitempty"`
-	//*
+	//
 	//The fee parameters used to calculate the execution fees.
 	ExecutionFee *ExecutionFee `protobuf:"bytes,4,opt,name=execution_fee,json=executionFee,proto3" json:"execution_fee,omitempty"`
-	//*
+	//
 	//The batch transaction with all non-witness data.
 	BatchTransaction []byte `protobuf:"bytes,5,opt,name=batch_transaction,json=batchTransaction,proto3" json:"batch_transaction,omitempty"`
-	//*
+	//
 	//Fee rate of the batch transaction, expressed in satoshis per 1000 weight
 	//units (sat/kW).
-	FeeRateSatPerKw int64 `protobuf:"varint,6,opt,name=fee_rate_sat_per_kw,json=feeRateSatPerKw,proto3" json:"fee_rate_sat_per_kw,omitempty"`
-	//*
+	FeeRateSatPerKw uint64 `protobuf:"varint,6,opt,name=fee_rate_sat_per_kw,json=feeRateSatPerKw,proto3" json:"fee_rate_sat_per_kw,omitempty"`
+	//
 	//Fee rebate in satoshis, offered if another batch participant wants to pay
 	//more fees for a faster confirmation.
-	FeeRebateSat int64 `protobuf:"varint,7,opt,name=fee_rebate_sat,json=feeRebateSat,proto3" json:"fee_rebate_sat,omitempty"`
-	//*
+	FeeRebateSat uint64 `protobuf:"varint,7,opt,name=fee_rebate_sat,json=feeRebateSat,proto3" json:"fee_rebate_sat,omitempty"`
+	//
 	//The 32 byte unique identifier of this batch.
 	BatchId []byte `protobuf:"bytes,8,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
-	//*
+	//
 	//The batch verification protocol version the server is using. Clients that
 	//don't support this version MUST return an `OrderMatchAccept` message with
 	//an empty list of orders so the batch can continue. The user should then be
@@ -1309,14 +1309,14 @@ func (m *OrderMatchPrepare) GetBatchTransaction() []byte {
 	return nil
 }
 
-func (m *OrderMatchPrepare) GetFeeRateSatPerKw() int64 {
+func (m *OrderMatchPrepare) GetFeeRateSatPerKw() uint64 {
 	if m != nil {
 		return m.FeeRateSatPerKw
 	}
 	return 0
 }
 
-func (m *OrderMatchPrepare) GetFeeRebateSat() int64 {
+func (m *OrderMatchPrepare) GetFeeRebateSat() uint64 {
 	if m != nil {
 		return m.FeeRebateSat
 	}
@@ -1338,7 +1338,7 @@ func (m *OrderMatchPrepare) GetBatchVersion() uint32 {
 }
 
 type OrderMatchSignBegin struct {
-	//*
+	//
 	//The 32 byte unique identifier of this batch.
 	BatchId              []byte   `protobuf:"bytes,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1379,13 +1379,13 @@ func (m *OrderMatchSignBegin) GetBatchId() []byte {
 }
 
 type OrderMatchFinalize struct {
-	//*
+	//
 	//The unique identifier of the finalized batch.
 	BatchId []byte `protobuf:"bytes,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"`
-	//*
+	//
 	//The final transaction ID of the published batch transaction.
 	BatchTxid []byte `protobuf:"bytes,2,opt,name=batch_txid,json=batchTxid,proto3" json:"batch_txid,omitempty"`
-	//*
+	//
 	//The current block height at the time the batch transaction was published to
 	//the network.
 	HeightHint           uint32   `protobuf:"varint,3,opt,name=height_hint,json=heightHint,proto3" json:"height_hint,omitempty"`
@@ -1441,10 +1441,10 @@ func (m *OrderMatchFinalize) GetHeightHint() uint32 {
 }
 
 type SubscribeError struct {
-	//*
+	//
 	//The string representation of the subscription error.
 	Error string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	//*
+	//
 	//The error code of the subscription error.
 	ErrorCode            SubscribeError_Error `protobuf:"varint,2,opt,name=error_code,json=errorCode,proto3,enum=clmrpc.SubscribeError_Error" json:"error_code,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
@@ -1492,11 +1492,11 @@ func (m *SubscribeError) GetErrorCode() SubscribeError_Error {
 }
 
 type MatchedOrder struct {
-	//*
+	//
 	//The bids the trader's own order was matched against. This list is empty if
 	//the trader's order was a bid order itself.
 	MatchedBids []*MatchedBid `protobuf:"bytes,1,rep,name=matched_bids,json=matchedBids,proto3" json:"matched_bids,omitempty"`
-	//*
+	//
 	//The asks the trader's own order was matched against. This list is empty if
 	//the trader's order was an ask order itself.
 	MatchedAsks          []*MatchedAsk `protobuf:"bytes,2,rep,name=matched_asks,json=matchedAsks,proto3" json:"matched_asks,omitempty"`
@@ -1545,10 +1545,10 @@ func (m *MatchedOrder) GetMatchedAsks() []*MatchedAsk {
 }
 
 type MatchedAsk struct {
-	//*
+	//
 	//The ask order that was matched against.
 	Ask *ServerAsk `protobuf:"bytes,1,opt,name=ask,proto3" json:"ask,omitempty"`
-	//*
+	//
 	//The number of units that were filled from/by this matched order.
 	UnitsFilled          uint32   `protobuf:"varint,2,opt,name=units_filled,json=unitsFilled,proto3" json:"units_filled,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1596,10 +1596,10 @@ func (m *MatchedAsk) GetUnitsFilled() uint32 {
 }
 
 type MatchedBid struct {
-	//*
+	//
 	//The ask order that was matched against.
 	Bid *ServerBid `protobuf:"bytes,1,opt,name=bid,proto3" json:"bid,omitempty"`
-	//*
+	//
 	//The number of units that were filled from/by this matched order.
 	UnitsFilled          uint32   `protobuf:"varint,2,opt,name=units_filled,json=unitsFilled,proto3" json:"units_filled,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1647,23 +1647,23 @@ func (m *MatchedBid) GetUnitsFilled() uint32 {
 }
 
 type AccountDiff struct {
-	//*
+	//
 	//The final balance of the account after the executed batch.
-	EndingBalance int64 `protobuf:"varint,1,opt,name=ending_balance,json=endingBalance,proto3" json:"ending_balance,omitempty"`
-	//*
+	EndingBalance uint64 `protobuf:"varint,1,opt,name=ending_balance,json=endingBalance,proto3" json:"ending_balance,omitempty"`
+	//
 	//Depending on the amount of the final balance of the account, the remainder
 	//is either sent to a new on-chain output, extended off-chain or fully
 	//consumed by the batch and its fees.
 	EndingState AccountDiff_AccountState `protobuf:"varint,2,opt,name=ending_state,json=endingState,proto3,enum=clmrpc.AccountDiff_AccountState" json:"ending_state,omitempty"`
-	//*
+	//
 	//If the account was re-created on-chain then the new account's index in the
 	//transaction is set here. If the account was fully spent or the remainder was
 	//extended off-chain then no new account outpoint is created and -1 is
 	//returned here.
 	OutpointIndex int32 `protobuf:"varint,3,opt,name=outpoint_index,json=outpointIndex,proto3" json:"outpoint_index,omitempty"`
-	//*
-	//The user's sub account key this diff is referring to.
-	UserSubKey           []byte   `protobuf:"bytes,4,opt,name=user_sub_key,json=userSubKey,proto3" json:"user_sub_key,omitempty"`
+	//
+	//The trader's account key this diff is referring to.
+	TraderKey            []byte   `protobuf:"bytes,4,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1694,7 +1694,7 @@ func (m *AccountDiff) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_AccountDiff proto.InternalMessageInfo
 
-func (m *AccountDiff) GetEndingBalance() int64 {
+func (m *AccountDiff) GetEndingBalance() uint64 {
 	if m != nil {
 		return m.EndingBalance
 	}
@@ -1715,49 +1715,49 @@ func (m *AccountDiff) GetOutpointIndex() int32 {
 	return 0
 }
 
-func (m *AccountDiff) GetUserSubKey() []byte {
+func (m *AccountDiff) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
 
 type ServerOrder struct {
-	//*
-	//The user's sub key of the account to use for the order.
-	UserSubKey []byte `protobuf:"bytes,1,opt,name=user_sub_key,json=userSubKey,proto3" json:"user_sub_key,omitempty"`
-	//*
+	//
+	//The trader's account key of the account to use for the order.
+	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
+	//
 	//Fixed order rate in parts per million.
-	RateFixed int64 `protobuf:"varint,2,opt,name=rate_fixed,json=rateFixed,proto3" json:"rate_fixed,omitempty"`
-	//*
+	RateFixed uint32 `protobuf:"varint,2,opt,name=rate_fixed,json=rateFixed,proto3" json:"rate_fixed,omitempty"`
+	//
 	//Order amount in satoshis.
-	Amt int64 `protobuf:"varint,3,opt,name=amt,proto3" json:"amt,omitempty"`
-	//*
+	Amt uint64 `protobuf:"varint,3,opt,name=amt,proto3" json:"amt,omitempty"`
+	//
 	//Order nonce of 32 byte length, acts as unique order identifier.
 	OrderNonce []byte `protobuf:"bytes,6,opt,name=order_nonce,json=orderNonce,proto3" json:"order_nonce,omitempty"`
-	//*
+	//
 	//Signature of the order's digest, signed with the user's account key. The
 	//signature must be fixed-size LN wire format encoded. Version 0 includes the
 	//fields version, rate_fixed, amt, funding_fee_rate_sat_per_kw and
 	//min/max_duration_blocks in the order digest.
 	OrderSig []byte `protobuf:"bytes,7,opt,name=order_sig,json=orderSig,proto3" json:"order_sig,omitempty"`
-	//*
+	//
 	//The multi signature key of the node creating the order, will be used for the
 	//target channel's funding TX 2-of-2 multi signature output.
 	MultiSigKey []byte `protobuf:"bytes,8,opt,name=multi_sig_key,json=multiSigKey,proto3" json:"multi_sig_key,omitempty"`
-	//*
+	//
 	//The pubkey of the node creating the order.
 	NodePub []byte `protobuf:"bytes,9,opt,name=node_pub,json=nodePub,proto3" json:"node_pub,omitempty"`
-	//*
+	//
 	//The network addresses of the node creating the order.
 	NodeAddr []*NodeAddress `protobuf:"bytes,10,rep,name=node_addr,json=nodeAddr,proto3" json:"node_addr,omitempty"`
-	//*
+	//
 	//The type of the channel that should be opened.
 	ChanType uint32 `protobuf:"varint,12,opt,name=chan_type,json=chanType,proto3" json:"chan_type,omitempty"`
-	//*
+	//
 	//Preferred fee rate to be used for the channel funding transaction, expressed
 	//in satoshis per 1000 weight units (sat/kW).
-	FundingFeeRateSatPerKw int64    `protobuf:"varint,13,opt,name=funding_fee_rate_sat_per_kw,json=fundingFeeRateSatPerKw,proto3" json:"funding_fee_rate_sat_per_kw,omitempty"`
+	FundingFeeRateSatPerKw uint64   `protobuf:"varint,13,opt,name=funding_fee_rate_sat_per_kw,json=fundingFeeRateSatPerKw,proto3" json:"funding_fee_rate_sat_per_kw,omitempty"`
 	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
 	XXX_unrecognized       []byte   `json:"-"`
 	XXX_sizecache          int32    `json:"-"`
@@ -1788,21 +1788,21 @@ func (m *ServerOrder) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ServerOrder proto.InternalMessageInfo
 
-func (m *ServerOrder) GetUserSubKey() []byte {
+func (m *ServerOrder) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
 
-func (m *ServerOrder) GetRateFixed() int64 {
+func (m *ServerOrder) GetRateFixed() uint32 {
 	if m != nil {
 		return m.RateFixed
 	}
 	return 0
 }
 
-func (m *ServerOrder) GetAmt() int64 {
+func (m *ServerOrder) GetAmt() uint64 {
 	if m != nil {
 		return m.Amt
 	}
@@ -1851,7 +1851,7 @@ func (m *ServerOrder) GetChanType() uint32 {
 	return 0
 }
 
-func (m *ServerOrder) GetFundingFeeRateSatPerKw() int64 {
+func (m *ServerOrder) GetFundingFeeRateSatPerKw() uint64 {
 	if m != nil {
 		return m.FundingFeeRateSatPerKw
 	}
@@ -1859,14 +1859,14 @@ func (m *ServerOrder) GetFundingFeeRateSatPerKw() int64 {
 }
 
 type ServerBid struct {
-	//*
+	//
 	//The common fields shared between both ask and bid order types.
 	Details *ServerOrder `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
-	//*
+	//
 	//Required minimum number of blocks that a channel opened as a result of this
 	//bid should be kept open.
-	MinDurationBlocks int64 `protobuf:"varint,2,opt,name=min_duration_blocks,json=minDurationBlocks,proto3" json:"min_duration_blocks,omitempty"`
-	//*
+	MinDurationBlocks uint32 `protobuf:"varint,2,opt,name=min_duration_blocks,json=minDurationBlocks,proto3" json:"min_duration_blocks,omitempty"`
+	//
 	//The version of the order format that is used. Will be increased once new
 	//features are added.
 	Version              uint32   `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
@@ -1907,7 +1907,7 @@ func (m *ServerBid) GetDetails() *ServerOrder {
 	return nil
 }
 
-func (m *ServerBid) GetMinDurationBlocks() int64 {
+func (m *ServerBid) GetMinDurationBlocks() uint32 {
 	if m != nil {
 		return m.MinDurationBlocks
 	}
@@ -1922,14 +1922,14 @@ func (m *ServerBid) GetVersion() uint32 {
 }
 
 type ServerAsk struct {
-	//*
+	//
 	//The common fields shared between both ask and bid order types.
 	Details *ServerOrder `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
-	//*
+	//
 	//The maximum number of blocks the liquidity provider is willing to provide
 	//the channel funds for.
-	MaxDurationBlocks int64 `protobuf:"varint,4,opt,name=max_duration_blocks,json=maxDurationBlocks,proto3" json:"max_duration_blocks,omitempty"`
-	//*
+	MaxDurationBlocks uint32 `protobuf:"varint,4,opt,name=max_duration_blocks,json=maxDurationBlocks,proto3" json:"max_duration_blocks,omitempty"`
+	//
 	//The version of the order format that is used. Will be increased once new
 	//features are added.
 	Version              uint32   `protobuf:"varint,5,opt,name=version,proto3" json:"version,omitempty"`
@@ -1970,7 +1970,7 @@ func (m *ServerAsk) GetDetails() *ServerOrder {
 	return nil
 }
 
-func (m *ServerAsk) GetMaxDurationBlocks() int64 {
+func (m *ServerAsk) GetMaxDurationBlocks() uint32 {
 	if m != nil {
 		return m.MaxDurationBlocks
 	}
@@ -2120,7 +2120,7 @@ func (m *ServerInput) GetOutpoint() *OutPoint {
 
 type ServerOutput struct {
 	// The value, in satoshis, of the output.
-	Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 	// The script of the output to send the value to.
 	Script               []byte   `protobuf:"bytes,2,opt,name=script,proto3" json:"script,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -2153,7 +2153,7 @@ func (m *ServerOutput) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ServerOutput proto.InternalMessageInfo
 
-func (m *ServerOutput) GetValue() uint32 {
+func (m *ServerOutput) GetValue() uint64 {
 	if m != nil {
 		return m.Value
 	}
@@ -2169,9 +2169,8 @@ func (m *ServerOutput) GetScript() []byte {
 
 type ServerModifyAccountRequest struct {
 	//
-	//The user sub key that corresponds to the account to be modified. This is
-	//also known as the trader key.
-	UserSubKey []byte `protobuf:"bytes,1,opt,name=user_sub_key,json=userSubKey,proto3" json:"user_sub_key,omitempty"`
+	//The trader's account key of the account to be modified.
+	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
 	//
 	//An additional set of inputs that can be included in the spending transaction
 	//of an account. These can be used to deposit more funds into an account.
@@ -2214,9 +2213,9 @@ func (m *ServerModifyAccountRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ServerModifyAccountRequest proto.InternalMessageInfo
 
-func (m *ServerModifyAccountRequest) GetUserSubKey() []byte {
+func (m *ServerModifyAccountRequest) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
@@ -2244,7 +2243,7 @@ func (m *ServerModifyAccountRequest) GetNewParams() *ServerModifyAccountRequest_
 
 type ServerModifyAccountRequest_NewAccountParameters struct {
 	// The new value of the account.
-	Value                uint32   `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	Value                uint64   `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2279,7 +2278,7 @@ func (m *ServerModifyAccountRequest_NewAccountParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ServerModifyAccountRequest_NewAccountParameters proto.InternalMessageInfo
 
-func (m *ServerModifyAccountRequest_NewAccountParameters) GetValue() uint32 {
+func (m *ServerModifyAccountRequest_NewAccountParameters) GetValue() uint64 {
 	if m != nil {
 		return m.Value
 	}
@@ -2287,7 +2286,7 @@ func (m *ServerModifyAccountRequest_NewAccountParameters) GetValue() uint32 {
 }
 
 type ServerModifyAccountResponse struct {
-	//*
+	//
 	//The auctioneer's signature that allows a trader to broadcast a transaction
 	//spending from an account output.
 	AccountSig           []byte   `protobuf:"bytes,1,opt,name=account_sig,json=accountSig,proto3" json:"account_sig,omitempty"`
@@ -2368,10 +2367,10 @@ func (m *ServerOrderStateRequest) GetOrderNonce() []byte {
 }
 
 type ServerOrderStateResponse struct {
-	//*
+	//
 	//The state the order currently is in.
 	State OrderState `protobuf:"varint,1,opt,name=state,proto3,enum=clmrpc.OrderState" json:"state,omitempty"`
-	//*
+	//
 	//The number of currently unfilled units of this order. This will be equal to
 	//the total amount of units until the order has reached the state PARTIAL_FILL
 	//or EXECUTED.
@@ -2452,7 +2451,7 @@ func (m *FeeQuoteRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_FeeQuoteRequest proto.InternalMessageInfo
 
 type FeeQuoteResponse struct {
-	//*
+	//
 	//The execution fee charged per matched order.
 	ExecutionFee         *ExecutionFee `protobuf:"bytes,1,opt,name=execution_fee,json=executionFee,proto3" json:"execution_fee,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
@@ -2565,7 +2564,7 @@ type RelevantBatch struct {
 	//
 	//Fee rate of the batch transaction, expressed in satoshis per 1000 weight
 	//units (sat/kW).
-	FeeRateSatPerKw      uint32   `protobuf:"varint,8,opt,name=fee_rate_sat_per_kw,json=feeRateSatPerKw,proto3" json:"fee_rate_sat_per_kw,omitempty"`
+	FeeRateSatPerKw      uint64   `protobuf:"varint,8,opt,name=fee_rate_sat_per_kw,json=feeRateSatPerKw,proto3" json:"fee_rate_sat_per_kw,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2645,7 +2644,7 @@ func (m *RelevantBatch) GetTransaction() []byte {
 	return nil
 }
 
-func (m *RelevantBatch) GetFeeRateSatPerKw() uint32 {
+func (m *RelevantBatch) GetFeeRateSatPerKw() uint64 {
 	if m != nil {
 		return m.FeeRateSatPerKw
 	}
@@ -2653,12 +2652,12 @@ func (m *RelevantBatch) GetFeeRateSatPerKw() uint32 {
 }
 
 type ExecutionFee struct {
-	//*
+	//
 	//The base fee in satoshis charged per order, regardless of the matched size.
-	BaseFee int64 `protobuf:"varint,1,opt,name=base_fee,json=baseFee,proto3" json:"base_fee,omitempty"`
-	//*
+	BaseFee uint64 `protobuf:"varint,1,opt,name=base_fee,json=baseFee,proto3" json:"base_fee,omitempty"`
+	//
 	//The fee rate in parts per million
-	FeeRate              int64    `protobuf:"varint,2,opt,name=fee_rate,json=feeRate,proto3" json:"fee_rate,omitempty"`
+	FeeRate              uint64   `protobuf:"varint,2,opt,name=fee_rate,json=feeRate,proto3" json:"fee_rate,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2689,14 +2688,14 @@ func (m *ExecutionFee) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ExecutionFee proto.InternalMessageInfo
 
-func (m *ExecutionFee) GetBaseFee() int64 {
+func (m *ExecutionFee) GetBaseFee() uint64 {
 	if m != nil {
 		return m.BaseFee
 	}
 	return 0
 }
 
-func (m *ExecutionFee) GetFeeRate() int64 {
+func (m *ExecutionFee) GetFeeRate() uint64 {
 	if m != nil {
 		return m.FeeRate
 	}
@@ -2751,12 +2750,12 @@ func (m *NodeAddress) GetAddr() string {
 }
 
 type OutPoint struct {
-	//*
+	//
 	//Raw bytes representing the transaction id.
 	Txid []byte `protobuf:"bytes,1,opt,name=txid,proto3" json:"txid,omitempty"`
-	//*
+	//
 	//The index of the output on the transaction.
-	OutputIndex          uint32   `protobuf:"varint,2,opt,name=output_index,proto3" json:"output_index,omitempty"`
+	OutputIndex          uint32   `protobuf:"varint,2,opt,name=output_index,json=outputIndex,proto3" json:"output_index,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2858,169 +2857,168 @@ func init() {
 func init() { proto.RegisterFile("auctioneer.proto", fileDescriptor_f3883418d94ca37f) }
 
 var fileDescriptor_f3883418d94ca37f = []byte{
-	// 2578 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x6f, 0x23, 0x49,
-	0x15, 0x4f, 0xfb, 0x23, 0xb1, 0x9f, 0xdb, 0x89, 0x53, 0xc9, 0xcc, 0x7a, 0x3c, 0x33, 0x4c, 0xa6,
-	0x97, 0x15, 0x61, 0x19, 0xb2, 0x4b, 0x56, 0xab, 0x5d, 0x76, 0x60, 0x85, 0x3f, 0xda, 0xb2, 0x67,
-	0x12, 0x27, 0x94, 0x9d, 0xec, 0xec, 0xa9, 0xd5, 0x76, 0x97, 0xed, 0x22, 0x76, 0xb7, 0xb7, 0x3f,
-	0x66, 0x12, 0x84, 0x90, 0x90, 0x38, 0x71, 0xe0, 0x3f, 0xe0, 0xc8, 0x05, 0x21, 0x21, 0x4e, 0xdc,
-	0xf9, 0x3f, 0xe0, 0xc8, 0x9d, 0x33, 0x17, 0x54, 0x1f, 0xdd, 0xee, 0x6e, 0x3b, 0x99, 0xd1, 0x22,
-	0x2e, 0x49, 0xd7, 0x7b, 0xbf, 0x57, 0xf5, 0xea, 0xd5, 0x7b, 0xaf, 0xde, 0x2b, 0x43, 0xc5, 0x0c,
-	0x46, 0x3e, 0x75, 0x6c, 0x42, 0xdc, 0xa3, 0x85, 0xeb, 0xf8, 0x0e, 0xda, 0x1c, 0xcd, 0xe6, 0xee,
-	0x62, 0x54, 0x7b, 0x34, 0x71, 0x9c, 0xc9, 0x8c, 0x7c, 0x64, 0x2e, 0xe8, 0x47, 0xa6, 0x6d, 0x3b,
-	0xbe, 0xc9, 0x70, 0x9e, 0x40, 0x69, 0xef, 0xc1, 0x3d, 0x4c, 0x3c, 0xe2, 0xbe, 0x26, 0xf5, 0xd1,
-	0xc8, 0x09, 0x6c, 0x1f, 0x93, 0x6f, 0x02, 0xe2, 0xf9, 0xda, 0x15, 0xdc, 0x4f, 0x33, 0xbc, 0x85,
-	0x63, 0x7b, 0x04, 0x7d, 0x00, 0xdb, 0xcb, 0xc5, 0x8c, 0x2b, 0x72, 0x53, 0x55, 0x0e, 0x94, 0x43,
-	0x15, 0x97, 0x97, 0xd4, 0x97, 0xe4, 0x06, 0x7d, 0x08, 0xbb, 0xd4, 0xa6, 0x3e, 0x35, 0x67, 0xc6,
-	0xd0, 0xf4, 0x47, 0x53, 0x8e, 0xcc, 0x70, 0xe4, 0x8e, 0x64, 0x34, 0x18, 0xfd, 0x25, 0xb9, 0xd1,
-	0xfe, 0xa5, 0x40, 0xb5, 0xcf, 0xd6, 0x72, 0xbb, 0x36, 0xf5, 0x93, 0x9a, 0xa0, 0x4f, 0xa1, 0x6c,
-	0x0a, 0x8a, 0xb1, 0x70, 0xa8, 0xed, 0xf3, 0xe5, 0x4a, 0xc7, 0x95, 0x23, 0xb1, 0xc1, 0xa3, 0xb3,
-	0xc0, 0x3f, 0x67, 0x74, 0xac, 0x4a, 0x18, 0x1f, 0x71, 0x35, 0xa5, 0x98, 0x37, 0x72, 0xe9, 0xc2,
-	0x97, 0x8b, 0x87, 0x93, 0xf5, 0x39, 0x11, 0xbd, 0xbf, 0x9c, 0xfd, 0xb5, 0x39, 0x0b, 0x48, 0x35,
-	0x7b, 0xa0, 0x1c, 0x96, 0xa3, 0xb9, 0x2e, 0x19, 0x2d, 0x3e, 0x17, 0xb9, 0x5e, 0x50, 0xf7, 0xa6,
-	0x9a, 0xe3, 0xa8, 0x50, 0x54, 0xe7, 0x44, 0x74, 0x00, 0x6a, 0xe0, 0x11, 0xd7, 0xf0, 0x82, 0x21,
-	0xdf, 0x6d, 0x9e, 0x2f, 0x08, 0x8c, 0xd6, 0x0f, 0x86, 0x6c, 0xa3, 0x0f, 0xe1, 0xc1, 0x9a, 0x7d,
-	0x0a, 0xc3, 0x6a, 0x5e, 0x68, 0x84, 0x7e, 0x30, 0x9c, 0x53, 0xff, 0xcc, 0xb5, 0x88, 0x1b, 0x1a,
-	0xe1, 0x03, 0xc8, 0x9a, 0xde, 0x95, 0xdc, 0xfa, 0x6e, 0xb8, 0x75, 0x01, 0xaf, 0x7b, 0x57, 0x9d,
-	0x0d, 0xcc, 0xf8, 0x0c, 0x36, 0xa4, 0x16, 0xdf, 0xe9, 0x0a, 0xac, 0x41, 0x2d, 0x06, 0x1b, 0x52,
-	0xab, 0x51, 0x84, 0x2d, 0x8b, 0xf8, 0x26, 0x9d, 0x79, 0xda, 0x6f, 0x94, 0x50, 0xa5, 0xc4, 0xaa,
-	0xf2, 0xac, 0x9f, 0x43, 0x99, 0xda, 0xaf, 0xcd, 0x19, 0xb5, 0x0c, 0x87, 0x31, 0xa4, 0x02, 0xfb,
-	0xe1, 0xcc, 0x5d, 0xc1, 0xe4, 0x42, 0x9d, 0x0d, 0xac, 0xd2, 0xd8, 0x18, 0x3d, 0x82, 0x82, 0x39,
-	0x1a, 0x91, 0x85, 0x4f, 0x84, 0x46, 0x85, 0xce, 0x06, 0x8e, 0x28, 0x71, 0x1d, 0x9e, 0x87, 0x1b,
-	0x6f, 0x9a, 0xf6, 0x88, 0xcc, 0x12, 0x1b, 0x7f, 0x02, 0x25, 0xbe, 0xb2, 0x61, 0x3b, 0xf6, 0x88,
-	0x48, 0x57, 0x03, 0x4e, 0xea, 0x31, 0xca, 0xd2, 0xa4, 0x09, 0x61, 0x69, 0xd2, 0x3f, 0x66, 0x60,
-	0xbf, 0x39, 0xa3, 0xc4, 0xf6, 0xeb, 0xc2, 0x39, 0x4f, 0x89, 0xe7, 0x99, 0x13, 0x82, 0x3e, 0x81,
-	0xcd, 0x91, 0x33, 0x9f, 0xd3, 0xd0, 0x9b, 0x1e, 0x84, 0x3b, 0x92, 0x87, 0xd2, 0xe4, 0xcc, 0x39,
-	0xb1, 0xfd, 0xce, 0x06, 0x96, 0x50, 0xf4, 0x1c, 0x8a, 0x5e, 0x30, 0x64, 0xde, 0x34, 0x24, 0xd2,
-	0xc6, 0x0f, 0x53, 0x72, 0x7d, 0xc1, 0x5f, 0xb0, 0xb5, 0x3a, 0x1b, 0x78, 0x89, 0x47, 0xc7, 0xb0,
-	0x29, 0xf6, 0xce, 0x3d, 0xac, 0x74, 0x5c, 0x8d, 0xfc, 0x97, 0x69, 0x7c, 0xca, 0x42, 0xa1, 0xce,
-	0xf9, 0x6c, 0x41, 0x81, 0x64, 0x32, 0x2e, 0xf9, 0x05, 0x19, 0xf9, 0xdc, 0xdf, 0xd6, 0xca, 0x60,
-	0xce, 0x67, 0x32, 0x02, 0x89, 0x9e, 0x41, 0xce, 0xa3, 0x13, 0x9b, 0x3b, 0x5f, 0xe9, 0xf8, 0xfe,
-	0xaa, 0x44, 0x9f, 0x4e, 0x98, 0x6a, 0x1c, 0xd5, 0xc8, 0x43, 0x76, 0xee, 0x4d, 0xb4, 0xaf, 0x61,
-	0x77, 0x65, 0xe3, 0xcc, 0xf4, 0x62, 0xe3, 0xc6, 0xd4, 0xf4, 0xa6, 0xa1, 0xe9, 0x05, 0xa9, 0x63,
-	0x7a, 0x53, 0x16, 0x3b, 0x22, 0xb4, 0x5f, 0x13, 0xd7, 0xa3, 0x8e, 0xcd, 0x6d, 0x52, 0xc6, 0x2a,
-	0x27, 0x5e, 0x0a, 0x9a, 0x16, 0xc0, 0xde, 0x1a, 0xdb, 0xac, 0xc4, 0x8a, 0x92, 0x8e, 0x15, 0xf4,
-	0x14, 0x54, 0xb9, 0xbc, 0x38, 0x7a, 0x11, 0xbe, 0x52, 0x25, 0x7e, 0xf6, 0xe8, 0x01, 0x14, 0xcc,
-	0xc0, 0x9f, 0x1a, 0x1e, 0x9d, 0x70, 0xab, 0xaa, 0x78, 0x8b, 0x8d, 0xfb, 0x74, 0xa2, 0xf5, 0xa0,
-	0x92, 0x36, 0xec, 0xaa, 0x2f, 0x65, 0x93, 0xbe, 0xc4, 0xe6, 0x13, 0x1b, 0x92, 0x31, 0xa4, 0xe2,
-	0x2d, 0x3e, 0xee, 0x5a, 0xda, 0x3f, 0x95, 0xf8, 0x84, 0xc2, 0xea, 0x09, 0xbc, 0x92, 0xc0, 0xa3,
-	0xfb, 0xec, 0xe8, 0x4c, 0x4f, 0x1a, 0xa5, 0x88, 0xe5, 0x08, 0xb5, 0xa1, 0x24, 0xbe, 0x8c, 0x91,
-	0x63, 0x89, 0x6c, 0xb3, 0x7d, 0xfc, 0xc1, 0x6d, 0xe7, 0x7a, 0x24, 0xfe, 0x61, 0x2e, 0x81, 0x41,
-	0x48, 0x36, 0x1d, 0x8b, 0x68, 0x67, 0xa0, 0xc6, 0x79, 0xa8, 0x04, 0x5b, 0x17, 0xbd, 0x97, 0xbd,
-	0xb3, 0xaf, 0x7a, 0x95, 0x0d, 0x74, 0x1f, 0x50, 0x5f, 0xc7, 0x97, 0x3a, 0x36, 0x4e, 0xbb, 0xfd,
-	0x86, 0xde, 0xa9, 0x5f, 0x76, 0xcf, 0x70, 0x45, 0x41, 0x35, 0xb8, 0xdf, 0xa8, 0x0f, 0x9a, 0x1d,
-	0xe3, 0x52, 0xc7, 0xfd, 0xee, 0x59, 0x8f, 0xb1, 0x4f, 0x19, 0xa1, 0x92, 0xd1, 0xfe, 0xa6, 0xc0,
-	0x76, 0xd2, 0x49, 0xee, 0xda, 0xde, 0x0b, 0x50, 0xa3, 0xec, 0x4a, 0x27, 0x5e, 0x35, 0x73, 0x90,
-	0x3d, 0x2c, 0x1d, 0x7f, 0x6f, 0xbd, 0xb7, 0x45, 0xc1, 0x41, 0x27, 0x9e, 0x6e, 0xfb, 0xee, 0x0d,
-	0x2e, 0x99, 0x4b, 0x4a, 0xed, 0x4b, 0xa8, 0xa4, 0x01, 0xa8, 0x02, 0xd9, 0xd0, 0x2b, 0x8a, 0x98,
-	0x7d, 0xa2, 0x7d, 0xc8, 0x8b, 0x04, 0x2d, 0x0e, 0x46, 0x0c, 0xbe, 0xc8, 0x7c, 0xae, 0x68, 0x7f,
-	0xca, 0xc0, 0xbe, 0xcc, 0x84, 0xc9, 0x20, 0xff, 0x0c, 0x8a, 0xa3, 0xa9, 0x39, 0x9b, 0x11, 0x7b,
-	0x42, 0x64, 0x9c, 0xbf, 0x97, 0xcc, 0x89, 0xcd, 0x90, 0xcd, 0x62, 0x35, 0xc2, 0xa2, 0x4f, 0x61,
-	0x6b, 0xe1, 0x92, 0x85, 0xe9, 0x86, 0x61, 0xfe, 0x60, 0x75, 0x63, 0xe7, 0x02, 0xd0, 0xd9, 0xc0,
-	0x21, 0x16, 0xfd, 0x48, 0x86, 0x5e, 0x36, 0x99, 0x1a, 0x92, 0xc6, 0x68, 0x90, 0x09, 0x8d, 0xe2,
-	0x0f, 0x7d, 0x0e, 0x85, 0x31, 0xb5, 0xcd, 0x19, 0xfd, 0x25, 0x91, 0x31, 0x5e, 0x5b, 0x15, 0x6b,
-	0x4b, 0x04, 0xcb, 0x9f, 0x21, 0x1a, 0x1d, 0x41, 0x9e, 0xb8, 0xae, 0xe3, 0xa6, 0x03, 0xbd, 0x1f,
-	0x66, 0x1c, 0x9d, 0x71, 0x3b, 0x1b, 0x58, 0xc0, 0xc2, 0x48, 0x3f, 0x87, 0x9d, 0xd4, 0xd6, 0xd1,
-	0xa3, 0xb4, 0x99, 0xd4, 0xb8, 0x2d, 0x52, 0x59, 0x20, 0x93, 0xce, 0x02, 0xda, 0x9f, 0x73, 0xb0,
-	0xbb, 0x62, 0x16, 0xd4, 0x87, 0xed, 0x39, 0x1b, 0x13, 0x79, 0x73, 0x78, 0x3c, 0xdc, 0x4a, 0xc7,
-	0xcf, 0x6e, 0xb5, 0xe4, 0xd1, 0xa9, 0xc0, 0x73, 0x86, 0xf4, 0x93, 0xf2, 0x3c, 0x4e, 0x43, 0x47,
-	0xb0, 0x37, 0x9a, 0x11, 0xd3, 0xa5, 0xf6, 0xc4, 0x58, 0xb8, 0x74, 0x44, 0x0c, 0xd7, 0xf4, 0x89,
-	0x4c, 0x3b, 0xbb, 0x21, 0xeb, 0x9c, 0x71, 0xb0, 0xe9, 0x13, 0xf4, 0x25, 0x54, 0x46, 0x53, 0xd3,
-	0x9d, 0x10, 0xcb, 0x90, 0x0e, 0xe7, 0x55, 0xb3, 0x5c, 0x8d, 0xbd, 0x54, 0xde, 0x6e, 0xd1, 0xf1,
-	0x18, 0xef, 0x48, 0xb0, 0xa4, 0x79, 0xe8, 0xc7, 0x50, 0x26, 0xd7, 0x64, 0x14, 0x30, 0xa7, 0x32,
-	0xc6, 0x24, 0x3c, 0xa2, 0xe8, 0xfa, 0xd3, 0x43, 0x66, 0x9b, 0x10, 0xac, 0x92, 0xd8, 0x08, 0xfd,
-	0x00, 0x76, 0x45, 0xec, 0xf8, 0xae, 0x69, 0x7b, 0x26, 0xf7, 0x4b, 0x59, 0x10, 0x54, 0x38, 0x63,
-	0xb0, 0xa4, 0xa3, 0x67, 0xb0, 0x37, 0x26, 0x62, 0x33, 0x86, 0x67, 0xfa, 0xc6, 0x82, 0x15, 0x56,
-	0x6f, 0xaa, 0x9b, 0x07, 0xca, 0x61, 0x16, 0xef, 0x8c, 0x09, 0xdf, 0x4d, 0xdf, 0xf4, 0xcf, 0x89,
-	0xfb, 0xf2, 0x0d, 0xfa, 0x2e, 0x6c, 0x73, 0x34, 0x19, 0x4a, 0x7c, 0x75, 0x8b, 0x03, 0x55, 0x06,
-	0xe4, 0xc4, 0xbe, 0x99, 0xcc, 0x4d, 0x85, 0x64, 0xf0, 0xae, 0xe4, 0xed, 0xe2, 0x6a, 0xde, 0xae,
-	0x5d, 0x02, 0x5a, 0x3d, 0x90, 0x35, 0x71, 0xf9, 0x61, 0x3c, 0x2e, 0x63, 0xb6, 0x89, 0x0b, 0xc7,
-	0xa3, 0xf5, 0x63, 0xd8, 0x5b, 0x13, 0x10, 0x77, 0xe4, 0x1a, 0xcd, 0x01, 0xb4, 0x1a, 0x0b, 0x77,
-	0x25, 0xa7, 0xc7, 0x00, 0xd2, 0xf6, 0xd7, 0x51, 0x22, 0x2f, 0x0a, 0xa3, 0x5f, 0x53, 0x8b, 0x79,
-	0xf4, 0x94, 0xd0, 0xc9, 0xd4, 0x37, 0xa6, 0xac, 0x9c, 0x14, 0x05, 0x1f, 0x08, 0x52, 0x87, 0xda,
-	0xbe, 0xf6, 0x7b, 0x05, 0xb6, 0x93, 0x61, 0xc4, 0xb2, 0x8f, 0x88, 0x36, 0xb1, 0x73, 0x31, 0x40,
-	0xcf, 0x01, 0xf8, 0x87, 0xc8, 0xe5, 0x19, 0x9e, 0xcb, 0x1f, 0xad, 0x0f, 0xc4, 0x23, 0xfe, 0x17,
-	0x17, 0x39, 0x9e, 0x67, 0xf0, 0xef, 0x43, 0x5e, 0xcc, 0x9d, 0x48, 0xdd, 0x7b, 0xb0, 0x23, 0x53,
-	0x77, 0xbf, 0x73, 0x31, 0x68, 0x31, 0xa2, 0xa2, 0xfd, 0x0a, 0xd4, 0xb8, 0x39, 0xd1, 0xa7, 0xa0,
-	0x86, 0xc1, 0x35, 0xa4, 0x56, 0x18, 0x5a, 0x28, 0x65, 0xfa, 0x06, 0xb5, 0x70, 0x69, 0x1e, 0x7d,
-	0x7b, 0x71, 0x31, 0xd3, 0xbb, 0x0a, 0x93, 0x76, 0x5a, 0xac, 0xee, 0x5d, 0x45, 0x62, 0x75, 0xef,
-	0xca, 0xd3, 0x06, 0x00, 0x4b, 0x16, 0x7a, 0xff, 0xee, 0x4a, 0x54, 0xd4, 0xa1, 0x4f, 0x41, 0x0d,
-	0x6c, 0xea, 0x7b, 0xc6, 0x98, 0xce, 0x66, 0xb2, 0xfc, 0x2b, 0xe3, 0x12, 0xa7, 0xb5, 0x39, 0x29,
-	0x36, 0x6b, 0x83, 0x32, 0x97, 0xe4, 0x85, 0xab, 0x72, 0x4b, 0xe1, 0xca, 0xcb, 0xd6, 0x77, 0x99,
-	0xf5, 0xef, 0x19, 0x28, 0xc5, 0x42, 0x9a, 0x55, 0xee, 0xc4, 0xb6, 0x58, 0xbe, 0x18, 0x9a, 0x33,
-	0x33, 0xac, 0x20, 0xb3, 0xb8, 0x2c, 0xa8, 0x0d, 0x41, 0x44, 0x4d, 0x50, 0x25, 0xcc, 0xf3, 0xc3,
-	0x8c, 0xb2, 0x7d, 0x7c, 0xb0, 0x26, 0x49, 0x44, 0x77, 0x19, 0xc3, 0xe1, 0x92, 0x90, 0xe2, 0x03,
-	0xb6, 0x96, 0x13, 0xf8, 0xbc, 0x47, 0x31, 0xa8, 0x6d, 0x91, 0x6b, 0xee, 0x5a, 0x79, 0x5c, 0x0e,
-	0xa9, 0x5d, 0x46, 0x5c, 0xa9, 0x7c, 0x72, 0x2b, 0x5d, 0xc2, 0xaf, 0x41, 0x8d, 0xaf, 0x82, 0xf6,
-	0xa1, 0x72, 0x76, 0x31, 0x38, 0xbf, 0x18, 0x18, 0x58, 0x6f, 0x62, 0xbd, 0x3e, 0xd0, 0x5b, 0x95,
-	0x0d, 0xf4, 0x14, 0x1e, 0x4b, 0x6a, 0xeb, 0xa2, 0x3f, 0x30, 0xf4, 0x57, 0x03, 0xbd, 0xd7, 0xd2,
-	0x5b, 0xc6, 0x59, 0xbb, 0xdd, 0xec, 0xd4, 0xbb, 0xbd, 0x8a, 0x82, 0x1e, 0xc3, 0x83, 0x38, 0xa4,
-	0xde, 0x62, 0xfc, 0xc1, 0x99, 0xd1, 0xd6, 0xf5, 0x7e, 0x25, 0xc3, 0xca, 0x04, 0xc9, 0x6e, 0x5f,
-	0x9c, 0x9c, 0x7c, 0x6d, 0xf4, 0xcf, 0xf5, 0xde, 0xa0, 0x92, 0xd5, 0xfe, 0x93, 0x81, 0x92, 0x30,
-	0xbd, 0x70, 0xb7, 0xb7, 0xd7, 0x6a, 0x8f, 0x01, 0x78, 0xf2, 0x1a, 0xd3, 0x6b, 0x79, 0x2e, 0x59,
-	0x5c, 0x64, 0x94, 0x36, 0x23, 0xb0, 0xac, 0x61, 0xce, 0x45, 0xa4, 0x65, 0x31, 0xfb, 0x4c, 0x97,
-	0x62, 0x9b, 0xe9, 0xb2, 0x1e, 0x3d, 0x84, 0xa2, 0x00, 0xb0, 0xda, 0x6e, 0x8b, 0xb3, 0x0b, 0x9c,
-	0xd0, 0xa7, 0x13, 0xa4, 0x41, 0x79, 0x1e, 0xcc, 0x7c, 0xca, 0x98, 0x5c, 0x23, 0x91, 0xe0, 0x4a,
-	0x9c, 0xd8, 0xa7, 0x13, 0xa6, 0xd2, 0x03, 0x28, 0xd8, 0x8e, 0x45, 0x8c, 0x45, 0x30, 0xe4, 0xf9,
-	0x4d, 0xc5, 0x5b, 0x6c, 0x7c, 0x1e, 0x0c, 0xd1, 0xc7, 0x50, 0xe4, 0x2c, 0xd3, 0xb2, 0xdc, 0x2a,
-	0x24, 0xef, 0x83, 0x9e, 0x63, 0x91, 0xba, 0x65, 0xb9, 0xc4, 0xf3, 0x30, 0x9f, 0x80, 0x0d, 0x98,
-	0x36, 0xa3, 0xa9, 0x69, 0x1b, 0xfe, 0xcd, 0x82, 0x54, 0x55, 0xee, 0x76, 0x05, 0x46, 0x18, 0xdc,
-	0x2c, 0x58, 0x93, 0xf4, 0x70, 0x1c, 0x08, 0xef, 0x59, 0x97, 0xc5, 0xcb, 0x7c, 0xd7, 0xf7, 0x25,
-	0xa4, 0x9d, 0x4c, 0xe6, 0x2f, 0x72, 0x85, 0x5c, 0x25, 0xff, 0x22, 0x57, 0xc8, 0x57, 0x36, 0x5f,
-	0xe4, 0x0a, 0xa5, 0x8a, 0xaa, 0xfd, 0x4e, 0x81, 0x62, 0xe4, 0xf8, 0xe8, 0x87, 0x51, 0x9b, 0x24,
-	0x83, 0x63, 0x2f, 0x19, 0x1c, 0x22, 0xbf, 0x86, 0x18, 0x76, 0x43, 0xce, 0xa9, 0x6d, 0x58, 0x81,
-	0xcb, 0xdb, 0x7c, 0x63, 0x38, 0x73, 0x46, 0x3c, 0xd2, 0x99, 0x0e, 0xbb, 0x73, 0x6a, 0xb7, 0x24,
-	0xa7, 0xc1, 0x19, 0xa8, 0x0a, 0x5b, 0xe1, 0x25, 0x20, 0x5a, 0xda, 0x70, 0xf8, 0x22, 0x57, 0xc8,
-	0x56, 0x72, 0xda, 0x6f, 0x23, 0x65, 0x58, 0xec, 0x7f, 0x0b, 0x65, 0xcc, 0xeb, 0x15, 0x65, 0x72,
-	0x52, 0x19, 0xf3, 0xfa, 0x76, 0x65, 0xf2, 0x09, 0x65, 0xb4, 0x23, 0x28, 0xc5, 0xda, 0xbb, 0xb7,
-	0x37, 0x85, 0x7f, 0x55, 0x40, 0x8d, 0xf7, 0xa6, 0x6f, 0x95, 0x40, 0x3f, 0x83, 0xd2, 0xd8, 0xa4,
-	0x33, 0x23, 0x56, 0xb4, 0x6f, 0x1f, 0x3f, 0x59, 0xd7, 0xe7, 0x1e, 0xb5, 0x4d, 0x3a, 0x0b, 0x2b,
-	0xf2, 0x71, 0xf4, 0xcd, 0x96, 0xe0, 0x33, 0x78, 0x3e, 0x2b, 0x42, 0xb8, 0xb3, 0x17, 0x05, 0xa0,
-	0xcf, 0x29, 0xda, 0x63, 0x80, 0xa5, 0x28, 0xda, 0x81, 0x52, 0xb7, 0x77, 0x59, 0x3f, 0xe9, 0xb6,
-	0x8c, 0xfa, 0xe9, 0xa0, 0xb2, 0xa1, 0x3d, 0x0f, 0x83, 0xae, 0x6b, 0x2f, 0x02, 0xd6, 0xc7, 0x15,
-	0xc2, 0xbc, 0x71, 0xeb, 0x8b, 0x47, 0x84, 0xd0, 0x7e, 0x02, 0xaa, 0x3c, 0x82, 0xc0, 0x67, 0xd2,
-	0x51, 0xb5, 0xac, 0x70, 0x43, 0x8a, 0x01, 0x6b, 0x4a, 0x12, 0x6f, 0x21, 0x72, 0xa4, 0xfd, 0x25,
-	0x03, 0x35, 0x21, 0x7e, 0xea, 0x58, 0x74, 0x7c, 0x93, 0x7a, 0x81, 0x79, 0x7b, 0xfc, 0x1f, 0x03,
-	0xd8, 0xe4, 0x8d, 0x41, 0x99, 0xe6, 0xe1, 0xbd, 0x92, 0xf2, 0x0d, 0xbe, 0x2b, 0x5c, 0xb4, 0xc9,
-	0x1b, 0xfe, 0xc5, 0x6e, 0xa3, 0x12, 0x93, 0x71, 0xb8, 0xc2, 0x61, 0x5d, 0xb6, 0x9f, 0x72, 0x28,
-	0xce, 0xc4, 0x6c, 0x72, 0xf1, 0xe9, 0xa1, 0x4b, 0xb1, 0xd4, 0xc2, 0x74, 0xcd, 0xb9, 0x27, 0x0b,
-	0xb2, 0xcf, 0x92, 0x52, 0xeb, 0x36, 0x71, 0xd4, 0x23, 0x6f, 0x24, 0xe5, 0x9c, 0x89, 0x12, 0x9f,
-	0xb8, 0x1e, 0x57, 0x87, 0x0f, 0xbd, 0xda, 0x33, 0xd8, 0x5f, 0x07, 0x59, 0x6f, 0x49, 0xed, 0x4b,
-	0x78, 0xb8, 0x76, 0x2d, 0xf9, 0x6e, 0xf2, 0x04, 0x4a, 0xb1, 0xf6, 0x28, 0x34, 0xd8, 0xb2, 0xe9,
-	0xd1, 0xbe, 0x80, 0xf7, 0x62, 0x21, 0x23, 0x2e, 0x93, 0x77, 0x7d, 0xf1, 0xf8, 0x26, 0x7c, 0x2e,
-	0x89, 0xcb, 0xca, 0x85, 0x0f, 0x21, 0x2f, 0x6e, 0x30, 0x85, 0x3b, 0x30, 0x4a, 0x54, 0xdb, 0x02,
-	0x2a, 0x00, 0xac, 0x40, 0x15, 0x97, 0x69, 0x60, 0x8f, 0x83, 0x59, 0xe2, 0x46, 0xad, 0x70, 0xc6,
-	0xc5, 0x92, 0xae, 0xed, 0xc2, 0x4e, 0x9b, 0x90, 0x9f, 0x07, 0x4e, 0xa4, 0xa6, 0x76, 0x0a, 0x95,
-	0x25, 0x49, 0xae, 0xbe, 0x52, 0x2f, 0x2b, 0xef, 0x5a, 0x2f, 0x6b, 0x0d, 0xd8, 0xc7, 0x64, 0x46,
-	0x5e, 0x9b, 0xb6, 0xdf, 0x10, 0xfd, 0xaf, 0xb0, 0xc6, 0x36, 0x64, 0xa2, 0x02, 0x2f, 0x43, 0x2d,
-	0x54, 0xe3, 0x8f, 0x4a, 0xa2, 0x94, 0xcf, 0xf0, 0x06, 0x3e, 0x1a, 0x6b, 0xff, 0xc8, 0x42, 0x39,
-	0x31, 0x49, 0x3c, 0xa3, 0x28, 0x89, 0x8c, 0x22, 0xe7, 0xcd, 0x44, 0xf3, 0xfe, 0xaf, 0xad, 0xc2,
-	0xd9, 0x4a, 0xbf, 0x93, 0xe3, 0xd2, 0x87, 0xa1, 0x74, 0x42, 0xb1, 0x6f, 0xdf, 0xeb, 0xe4, 0x6f,
-	0xeb, 0x75, 0x56, 0x6c, 0xbf, 0xf9, 0xce, 0xbd, 0xca, 0x01, 0x94, 0xe2, 0x5d, 0x8a, 0xb8, 0x6d,
-	0xe3, 0xa4, 0xdb, 0x1a, 0x94, 0x02, 0x57, 0x26, 0xdd, 0xa0, 0xfc, 0xdf, 0x5a, 0x87, 0x16, 0xa8,
-	0xf1, 0x5d, 0x88, 0x16, 0xc0, 0x23, 0x91, 0xa7, 0x65, 0x59, 0x0b, 0xe0, 0x11, 0xc9, 0x0a, 0x15,
-	0x96, 0x97, 0xdf, 0x96, 0xd4, 0x92, 0xe5, 0xd9, 0xd8, 0x25, 0xcf, 0x5c, 0xc4, 0x26, 0xfe, 0x1b,
-	0xc7, 0xbd, 0x92, 0xaa, 0x85, 0x43, 0x84, 0x20, 0xc7, 0x2b, 0x04, 0xf1, 0x80, 0xc3, 0xbf, 0xb5,
-	0x06, 0x14, 0xc2, 0xec, 0xcb, 0xf8, 0xbc, 0xc1, 0x10, 0xce, 0xc9, 0xbf, 0x91, 0x06, 0xaa, 0x48,
-	0x68, 0xb2, 0x02, 0x94, 0x2f, 0x62, 0x71, 0xda, 0x87, 0x7f, 0x50, 0x00, 0x96, 0xf1, 0xc8, 0x2a,
-	0xfe, 0x33, 0xdc, 0x62, 0x05, 0xff, 0x45, 0xe3, 0xb4, 0x3b, 0x10, 0xc5, 0xdd, 0x2e, 0x94, 0x05,
-	0xb1, 0x79, 0xa2, 0xd7, 0xb1, 0xde, 0x12, 0x8f, 0x37, 0x82, 0x74, 0x5e, 0xc7, 0x83, 0x6e, 0x9d,
-	0x15, 0x6c, 0xed, 0xee, 0xc9, 0x89, 0xde, 0xaa, 0x64, 0x10, 0x82, 0x6d, 0xc1, 0xd3, 0x5f, 0xe9,
-	0xcd, 0x0b, 0x36, 0x45, 0x76, 0x49, 0x6b, 0xd6, 0x7b, 0x4d, 0x9d, 0xe1, 0x72, 0xcb, 0x69, 0xf5,
-	0x57, 0xe7, 0x5d, 0x36, 0x6d, 0x1e, 0x55, 0x40, 0x15, 0xa4, 0x76, 0xbd, 0xcb, 0x40, 0x9b, 0xc7,
-	0xff, 0xce, 0xc3, 0x6e, 0x73, 0x6a, 0xda, 0x36, 0x99, 0xd5, 0xa3, 0x27, 0x7d, 0xe6, 0xe0, 0xc9,
-	0x1f, 0x04, 0xd0, 0xe3, 0xa5, 0x6b, 0xaf, 0xf9, 0x05, 0xa1, 0xf6, 0x9d, 0xdb, 0xd8, 0x32, 0x59,
-	0x60, 0x28, 0xc5, 0x5e, 0xc1, 0xd1, 0x41, 0xfa, 0xba, 0x48, 0xff, 0x10, 0x50, 0x7b, 0x7a, 0x07,
-	0x42, 0xce, 0xf9, 0x0a, 0xca, 0x89, 0x84, 0x8c, 0xb4, 0xb7, 0xdf, 0x0c, 0xb5, 0xf7, 0xef, 0xc4,
-	0x2c, 0xb5, 0x8d, 0x3d, 0x90, 0xa7, 0xb5, 0x5d, 0x7d, 0xb1, 0x4f, 0x6b, 0xbb, 0xee, 0x75, 0x1d,
-	0x27, 0xab, 0x9a, 0xd4, 0x9c, 0xab, 0x8f, 0xe1, 0xe9, 0x39, 0xd7, 0xbc, 0x78, 0xa3, 0xb3, 0x84,
-	0x6f, 0x3d, 0x59, 0x53, 0x9f, 0xc5, 0x2f, 0x9b, 0xda, 0xc1, 0xed, 0x00, 0x39, 0xe1, 0x57, 0x70,
-	0x2f, 0xea, 0x64, 0x79, 0xee, 0x92, 0x3e, 0x81, 0xa2, 0x46, 0x77, 0xdd, 0x03, 0x7b, 0xed, 0x51,
-	0xaa, 0x33, 0x4c, 0x70, 0x0f, 0x95, 0x8f, 0x15, 0xf4, 0x53, 0x28, 0x84, 0x17, 0x08, 0x8a, 0x9e,
-	0xe5, 0x52, 0xb7, 0x4c, 0xad, 0xba, 0xca, 0x90, 0x7a, 0x9d, 0xc0, 0xbd, 0x44, 0x4a, 0xed, 0xdb,
-	0xe6, 0xc2, 0x9b, 0x3a, 0xfe, 0x52, 0xaf, 0x75, 0xf7, 0x49, 0xed, 0xde, 0x5a, 0xee, 0x70, 0x93,
-	0xff, 0x1c, 0xf6, 0xc9, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x47, 0x26, 0xf8, 0x48, 0x1b,
-	0x00, 0x00,
+	// 2567 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x19, 0x4d, 0x73, 0xe3, 0x48,
+	0x35, 0xf2, 0x47, 0x62, 0x3f, 0xdb, 0x89, 0xd2, 0xc9, 0xcc, 0x7a, 0x3c, 0x13, 0x26, 0xa3, 0x65,
+	0x8b, 0xb0, 0x0c, 0xd9, 0x25, 0x5b, 0x5b, 0xbb, 0xec, 0xc0, 0x16, 0xfe, 0x90, 0xcb, 0x9e, 0x49,
+	0xec, 0x20, 0x3b, 0xd9, 0xd9, 0x93, 0xaa, 0x6d, 0xb5, 0xed, 0x26, 0xb6, 0xe4, 0x95, 0xe4, 0x49,
+	0x42, 0x51, 0x54, 0x51, 0xc5, 0x89, 0x03, 0xff, 0x80, 0x23, 0x17, 0x6a, 0x2f, 0x9c, 0x38, 0xf2,
+	0x4b, 0xe0, 0xc2, 0x2f, 0xe0, 0xc6, 0x91, 0xea, 0x0f, 0xc9, 0x92, 0xec, 0x64, 0xa6, 0x96, 0xe2,
+	0x92, 0xa8, 0xdf, 0x57, 0xbf, 0xf7, 0xfa, 0xbd, 0xd7, 0xef, 0xb5, 0x41, 0xc5, 0x8b, 0xa1, 0x4f,
+	0x1d, 0x9b, 0x10, 0xf7, 0x78, 0xee, 0x3a, 0xbe, 0x83, 0x36, 0x87, 0xd3, 0x99, 0x3b, 0x1f, 0x56,
+	0x9e, 0x8c, 0x1d, 0x67, 0x3c, 0x25, 0x1f, 0xe1, 0x39, 0xfd, 0x08, 0xdb, 0xb6, 0xe3, 0x63, 0x46,
+	0xe7, 0x09, 0x2a, 0xed, 0x3d, 0x78, 0x60, 0x10, 0x8f, 0xb8, 0x6f, 0x48, 0x75, 0x38, 0x74, 0x16,
+	0xb6, 0x6f, 0x90, 0x6f, 0x16, 0xc4, 0xf3, 0xb5, 0x2b, 0x78, 0x98, 0x44, 0x78, 0x73, 0xc7, 0xf6,
+	0x08, 0xfa, 0x00, 0xb6, 0x97, 0x9b, 0x99, 0x57, 0xe4, 0xb6, 0xac, 0x1c, 0x2a, 0x47, 0x45, 0xa3,
+	0xb4, 0x84, 0xbe, 0x22, 0xb7, 0xe8, 0x43, 0xd8, 0xa5, 0x36, 0xf5, 0x29, 0x9e, 0x9a, 0x03, 0xec,
+	0x0f, 0x27, 0x9c, 0x32, 0xc5, 0x29, 0x77, 0x24, 0xa2, 0xc6, 0xe0, 0xaf, 0xc8, 0xad, 0xf6, 0x2f,
+	0x05, 0xca, 0x3d, 0xb6, 0x97, 0xdb, 0xb6, 0xa9, 0x1f, 0xd7, 0x04, 0x7d, 0x0a, 0x25, 0x2c, 0x20,
+	0xe6, 0xdc, 0xa1, 0xb6, 0xcf, 0xb7, 0x2b, 0x9c, 0xa8, 0xc7, 0xc2, 0xc0, 0xe3, 0xee, 0xc2, 0x3f,
+	0x67, 0x70, 0xa3, 0x28, 0xc9, 0xf8, 0x8a, 0xab, 0x29, 0xd9, 0xbc, 0xa1, 0x4b, 0xe7, 0xbe, 0xdc,
+	0x3c, 0x10, 0xd6, 0xe3, 0x40, 0xf4, 0xfe, 0x52, 0xfa, 0x1b, 0x3c, 0x5d, 0x90, 0x72, 0xfa, 0x50,
+	0x39, 0xca, 0x84, 0xb2, 0x2e, 0x19, 0x2c, 0x2a, 0x8b, 0xdc, 0xcc, 0xa9, 0x7b, 0x5b, 0xce, 0x1c,
+	0x2a, 0x47, 0xa5, 0x50, 0x96, 0xce, 0x81, 0xe8, 0x00, 0xc0, 0x77, 0xb1, 0x25, 0xbd, 0x92, 0xe5,
+	0xdb, 0xe5, 0x05, 0x84, 0x59, 0xf9, 0x18, 0x1e, 0xad, 0x31, 0x52, 0x78, 0x55, 0xf3, 0x02, 0x0f,
+	0xf4, 0x16, 0x83, 0x19, 0xf5, 0xbb, 0xae, 0x45, 0xdc, 0xc0, 0x03, 0x1f, 0x40, 0x1a, 0x7b, 0x57,
+	0xd2, 0xee, 0xdd, 0xc0, 0x6e, 0x41, 0x5e, 0xf5, 0xae, 0x5a, 0x1b, 0x06, 0xc3, 0x33, 0xb2, 0x01,
+	0xb5, 0xb8, 0x99, 0x2b, 0x64, 0x35, 0x6a, 0x31, 0xb2, 0x01, 0xb5, 0x6a, 0x79, 0xd8, 0xb2, 0x88,
+	0x8f, 0xe9, 0xd4, 0xd3, 0x7e, 0xa7, 0x04, 0x2a, 0xc5, 0x76, 0x95, 0x07, 0xfd, 0x02, 0x4a, 0xd4,
+	0x7e, 0x83, 0xa7, 0xd4, 0x32, 0x1d, 0x86, 0x90, 0x0a, 0xec, 0x07, 0x92, 0xdb, 0x02, 0xc9, 0x99,
+	0x5a, 0x1b, 0x46, 0x91, 0x46, 0xd6, 0xe8, 0x09, 0xe4, 0xf0, 0x70, 0x48, 0xe6, 0x3e, 0x11, 0x1a,
+	0xe5, 0x5a, 0x1b, 0x46, 0x08, 0x89, 0xea, 0xf0, 0x22, 0x30, 0xbc, 0x8e, 0xed, 0x21, 0x99, 0xc6,
+	0x0c, 0x7f, 0x0a, 0x05, 0xbe, 0xb3, 0x69, 0x3b, 0xf6, 0x90, 0xc8, 0x38, 0x03, 0x0e, 0xea, 0x30,
+	0xc8, 0xd2, 0xa5, 0x31, 0x66, 0xe9, 0xd2, 0x3f, 0xa7, 0x60, 0xbf, 0x3e, 0xa5, 0xc4, 0xf6, 0xab,
+	0x22, 0x32, 0xcf, 0x88, 0xe7, 0xe1, 0x31, 0x41, 0x9f, 0xc0, 0xe6, 0xd0, 0x99, 0xcd, 0x68, 0x10,
+	0x4a, 0x8f, 0x02, 0x8b, 0xe4, 0xa1, 0xd4, 0x39, 0x72, 0x46, 0x6c, 0xbf, 0xb5, 0x61, 0x48, 0x52,
+	0xf4, 0x02, 0xf2, 0xde, 0x62, 0xc0, 0x42, 0x69, 0x40, 0xa4, 0x8f, 0x1f, 0x27, 0xf8, 0x7a, 0x02,
+	0x3f, 0x67, 0x7b, 0xb5, 0x36, 0x8c, 0x25, 0x3d, 0x3a, 0x81, 0x4d, 0x61, 0x3b, 0x0f, 0xaf, 0xc2,
+	0x49, 0x39, 0x0c, 0x5e, 0xa6, 0xf1, 0x19, 0xcb, 0x83, 0x2a, 0xc7, 0xb3, 0x0d, 0x05, 0x25, 0xe3,
+	0x71, 0xc9, 0xaf, 0xc8, 0xd0, 0xe7, 0xc1, 0xb6, 0x96, 0xc7, 0xe0, 0x78, 0xc6, 0x23, 0x28, 0xd1,
+	0x73, 0xc8, 0x78, 0x74, 0x6c, 0xf3, 0xd8, 0x2b, 0x9c, 0x3c, 0x5c, 0xe5, 0xe8, 0xd1, 0x31, 0x53,
+	0x8d, 0x53, 0xd5, 0xb2, 0x90, 0x9e, 0x79, 0x63, 0xed, 0x6b, 0xd8, 0x5d, 0x31, 0x9c, 0xb9, 0x5e,
+	0x18, 0x6e, 0x4e, 0xb0, 0x37, 0x09, 0x5c, 0x2f, 0x40, 0x2d, 0xec, 0x4d, 0x58, 0xe2, 0x88, 0xbc,
+	0x7e, 0x43, 0x5c, 0x8f, 0x3a, 0x36, 0xf7, 0x49, 0xc9, 0x28, 0x72, 0xe0, 0xa5, 0x80, 0x69, 0x2e,
+	0xec, 0xad, 0xf1, 0x4d, 0x22, 0x51, 0x94, 0x44, 0xa2, 0xa0, 0x67, 0x50, 0x94, 0x7b, 0x8b, 0x73,
+	0x17, 0x89, 0x2b, 0xf5, 0xe1, 0x07, 0x8f, 0x1e, 0x41, 0x0e, 0x2f, 0xfc, 0x89, 0xe9, 0xd1, 0x31,
+	0x77, 0x69, 0xd1, 0xd8, 0x62, 0xeb, 0x1e, 0x1d, 0x6b, 0x1d, 0x50, 0x93, 0x5e, 0x5d, 0x0d, 0xa4,
+	0x74, 0x3c, 0x90, 0x98, 0x3c, 0x61, 0x8d, 0x4c, 0xa0, 0xa2, 0xb1, 0xc5, 0xd7, 0x6d, 0x4b, 0xfb,
+	0xa7, 0x12, 0x15, 0x28, 0x5c, 0x1e, 0xa3, 0x57, 0x62, 0xf4, 0xe8, 0x21, 0x3b, 0x37, 0xec, 0x49,
+	0x8f, 0xe4, 0x0d, 0xb9, 0x42, 0x4d, 0x28, 0x88, 0x2f, 0x73, 0xe8, 0x58, 0xa2, 0xce, 0x6c, 0x9f,
+	0x7c, 0x70, 0xd7, 0xa1, 0x1e, 0x8b, 0x7f, 0x06, 0xe7, 0x30, 0x40, 0x70, 0xd6, 0x1d, 0x8b, 0x68,
+	0x5d, 0x28, 0x46, 0x71, 0xa8, 0x00, 0x5b, 0x17, 0x9d, 0x57, 0x9d, 0xee, 0x57, 0x1d, 0x75, 0x03,
+	0x3d, 0x04, 0xd4, 0xd3, 0x8d, 0x4b, 0xdd, 0x30, 0xcf, 0xda, 0xbd, 0x9a, 0xde, 0xaa, 0x5e, 0xb6,
+	0xbb, 0x86, 0xaa, 0xa0, 0x0a, 0x3c, 0xac, 0x55, 0xfb, 0xf5, 0x96, 0x79, 0xa9, 0x1b, 0xbd, 0x76,
+	0xb7, 0xc3, 0xd0, 0x67, 0x0c, 0xa0, 0xa6, 0xb4, 0xbf, 0x29, 0xb0, 0x1d, 0x8f, 0x90, 0xfb, 0xcc,
+	0x7b, 0x09, 0xc5, 0xb0, 0xae, 0xd2, 0xb1, 0x57, 0x4e, 0x1d, 0xa6, 0x8f, 0x0a, 0x27, 0x3f, 0x58,
+	0x1f, 0x6a, 0x61, 0x66, 0xd0, 0xb1, 0xa7, 0xdb, 0xbe, 0x7b, 0x6b, 0x14, 0xf0, 0x12, 0x52, 0xf9,
+	0x12, 0xd4, 0x24, 0x01, 0x52, 0x21, 0x1d, 0x04, 0x45, 0xde, 0x60, 0x9f, 0x68, 0x1f, 0xb2, 0xa2,
+	0x34, 0x8b, 0x83, 0x11, 0x8b, 0x2f, 0x52, 0x9f, 0x2b, 0xda, 0x5f, 0x52, 0xb0, 0x2f, 0xcb, 0x60,
+	0x3c, 0xc3, 0x3f, 0x83, 0xfc, 0x70, 0x82, 0xa7, 0x53, 0x62, 0x8f, 0x89, 0x4c, 0xf2, 0xf7, 0xe2,
+	0x05, 0xb1, 0x1e, 0xa0, 0x59, 0xa2, 0x86, 0xb4, 0xe8, 0x53, 0xd8, 0x9a, 0xbb, 0x64, 0x8e, 0xdd,
+	0x20, 0xc7, 0x1f, 0xad, 0x1a, 0x76, 0x2e, 0x08, 0x5a, 0x1b, 0x46, 0x40, 0x8b, 0x7e, 0x22, 0xf3,
+	0x2e, 0x1d, 0xaf, 0x0b, 0x71, 0x67, 0xd4, 0xc8, 0x98, 0x86, 0xc9, 0x87, 0x3e, 0x87, 0xdc, 0x88,
+	0xda, 0x78, 0x4a, 0x7f, 0x4d, 0x64, 0x82, 0x57, 0x56, 0xd9, 0x9a, 0x92, 0x82, 0x15, 0xcf, 0x80,
+	0x1a, 0x1d, 0x43, 0x96, 0xb8, 0xae, 0xe3, 0x26, 0xb3, 0xbc, 0x17, 0x94, 0x1b, 0x9d, 0x61, 0x5b,
+	0x1b, 0x86, 0x20, 0x0b, 0xd2, 0xfc, 0x1c, 0x76, 0x12, 0xa6, 0xa3, 0x27, 0x49, 0x37, 0x15, 0xa3,
+	0xbe, 0x48, 0x94, 0x80, 0x54, 0xb2, 0x04, 0x68, 0xdf, 0x66, 0x60, 0x77, 0xc5, 0x2d, 0xa8, 0x07,
+	0xdb, 0x33, 0xb6, 0x26, 0xf2, 0xda, 0xf0, 0x78, 0xba, 0x15, 0x4e, 0x9e, 0xdf, 0xe9, 0xc9, 0xe3,
+	0x33, 0x41, 0xcf, 0x11, 0x32, 0x4e, 0x4a, 0xb3, 0x28, 0x0c, 0x1d, 0xc3, 0xde, 0x70, 0x4a, 0xb0,
+	0x4b, 0xed, 0xb1, 0x39, 0x77, 0xe9, 0x90, 0x98, 0x2e, 0xf6, 0x89, 0xac, 0x39, 0xbb, 0x01, 0xea,
+	0x9c, 0x61, 0x0c, 0xec, 0x13, 0xf4, 0x25, 0xa8, 0xc3, 0x09, 0x76, 0xc7, 0xc4, 0x32, 0x65, 0xc0,
+	0x79, 0xe5, 0x34, 0x57, 0x63, 0x2f, 0x51, 0xb4, 0x1b, 0x74, 0x34, 0x32, 0x76, 0x24, 0xb1, 0x84,
+	0x79, 0xe8, 0xa7, 0x50, 0x22, 0x37, 0x64, 0xb8, 0x60, 0x41, 0x65, 0x8e, 0x48, 0x70, 0x44, 0xe1,
+	0xdd, 0xa7, 0x07, 0xc8, 0x26, 0x21, 0x46, 0x91, 0x44, 0x56, 0xe8, 0x47, 0xb0, 0x2b, 0x72, 0xc7,
+	0x77, 0xb1, 0xed, 0x61, 0x1e, 0x97, 0xb2, 0x19, 0x50, 0x39, 0xa2, 0xbf, 0x84, 0xa3, 0xe7, 0xb0,
+	0x37, 0x22, 0xc2, 0x18, 0xd3, 0xc3, 0xbe, 0x39, 0x67, 0x35, 0xf1, 0xba, 0xbc, 0xc9, 0x9b, 0x90,
+	0x9d, 0x11, 0xe1, 0xd6, 0xf4, 0xb0, 0x7f, 0x4e, 0xdc, 0x57, 0xd7, 0xe8, 0xfb, 0xb0, 0xcd, 0xa9,
+	0xc9, 0x40, 0xd2, 0x97, 0xb7, 0x44, 0xb7, 0xc2, 0x08, 0x39, 0xb0, 0x87, 0xe3, 0xb5, 0x29, 0x17,
+	0x4f, 0xde, 0x95, 0xa2, 0x9d, 0x5f, 0x2d, 0xda, 0x95, 0x4b, 0x40, 0xab, 0x07, 0xb2, 0x26, 0x2f,
+	0x3f, 0x8c, 0xe6, 0x65, 0xc4, 0x37, 0x51, 0xe6, 0x68, 0xb6, 0x7e, 0x0c, 0x7b, 0x6b, 0x12, 0xe2,
+	0x9e, 0x5a, 0xa3, 0x39, 0x80, 0x56, 0x73, 0xe1, 0xbe, 0xe2, 0x74, 0x00, 0x20, 0x7d, 0x7f, 0x13,
+	0x16, 0xf2, 0xbc, 0x70, 0xfa, 0x0d, 0xb5, 0x58, 0x44, 0x4f, 0x08, 0x1d, 0x4f, 0x7c, 0x73, 0xc2,
+	0x1a, 0xc9, 0x34, 0x37, 0x1e, 0x04, 0xa8, 0x45, 0x6d, 0x5f, 0xfb, 0xa3, 0x02, 0xdb, 0xf1, 0x34,
+	0x62, 0xd5, 0x47, 0x64, 0x9b, 0xb0, 0x5c, 0x2c, 0xd0, 0x0b, 0x00, 0xfe, 0x21, 0x6a, 0x79, 0x8a,
+	0xd7, 0xf2, 0x27, 0xeb, 0x13, 0xf1, 0x98, 0xff, 0x35, 0xf2, 0x9c, 0x9e, 0x57, 0xf0, 0x1f, 0x42,
+	0x56, 0xc8, 0x8e, 0x95, 0xee, 0x3d, 0xd8, 0x91, 0xa5, 0xbb, 0xd7, 0xba, 0xe8, 0x37, 0x18, 0x50,
+	0xd1, 0x7e, 0x03, 0xc5, 0xa8, 0x3b, 0xd1, 0xa7, 0x50, 0x0c, 0x92, 0x6b, 0x40, 0xad, 0x20, 0xb5,
+	0x50, 0xc2, 0xf5, 0x35, 0x6a, 0x19, 0x85, 0x59, 0xf8, 0xed, 0x45, 0xd9, 0xb0, 0x77, 0x15, 0x14,
+	0xed, 0x24, 0x5b, 0xd5, 0xbb, 0x0a, 0xd9, 0xaa, 0xde, 0x95, 0xa7, 0xf5, 0x01, 0x96, 0x28, 0xf4,
+	0xfe, 0xfd, 0x6d, 0xa8, 0x68, 0x42, 0x9f, 0x41, 0x71, 0x61, 0x53, 0xdf, 0x33, 0x47, 0x74, 0x3a,
+	0x95, 0xbd, 0x5f, 0xc9, 0x28, 0x70, 0x58, 0x93, 0x83, 0x22, 0x52, 0x6b, 0x94, 0x85, 0x24, 0xef,
+	0x5a, 0x95, 0x3b, 0xba, 0x56, 0xde, 0xb3, 0xbe, 0x8b, 0xd4, 0xbf, 0xa7, 0xa0, 0x10, 0x49, 0x69,
+	0xd6, 0xb3, 0x13, 0xdb, 0x62, 0xf5, 0x62, 0x80, 0xa7, 0x38, 0x68, 0x1f, 0x33, 0x46, 0x49, 0x40,
+	0x6b, 0x02, 0x88, 0xea, 0x50, 0x94, 0x64, 0x9e, 0x1f, 0x54, 0x94, 0xed, 0x93, 0xc3, 0x35, 0x45,
+	0x22, 0xbc, 0xcb, 0x18, 0x9d, 0x51, 0x10, 0x5c, 0x7c, 0xc1, 0xf6, 0x72, 0x16, 0x3e, 0x9f, 0x4e,
+	0x4c, 0x6a, 0x5b, 0xe4, 0x86, 0x87, 0x56, 0xd6, 0x28, 0x05, 0xd0, 0x36, 0x03, 0x26, 0xda, 0x9e,
+	0x4c, 0x72, 0x3e, 0xf8, 0x2d, 0x14, 0xa3, 0x5b, 0xa0, 0x7d, 0x50, 0xbb, 0x17, 0xfd, 0xf3, 0x8b,
+	0xbe, 0x69, 0xe8, 0x75, 0x43, 0xaf, 0xf6, 0xf5, 0x86, 0xba, 0x81, 0x9e, 0xc1, 0x81, 0x84, 0x36,
+	0x2e, 0x7a, 0x7d, 0x53, 0x7f, 0xdd, 0xd7, 0x3b, 0x0d, 0xbd, 0x61, 0x76, 0x9b, 0xcd, 0x7a, 0xab,
+	0xda, 0xee, 0xa8, 0x0a, 0x3a, 0x80, 0x47, 0x51, 0x92, 0x6a, 0x83, 0xe1, 0xfb, 0x5d, 0xb3, 0xa9,
+	0xeb, 0x3d, 0x35, 0xc5, 0x7a, 0x04, 0x89, 0x6e, 0x5e, 0x9c, 0x9e, 0x7e, 0x6d, 0xf6, 0xce, 0xf5,
+	0x4e, 0x5f, 0x4d, 0x6b, 0xff, 0x49, 0x41, 0x41, 0xf8, 0x5d, 0xc4, 0xda, 0x5b, 0xba, 0xb4, 0x03,
+	0x00, 0x5e, 0xb6, 0x46, 0xf4, 0x26, 0x3c, 0x91, 0x3c, 0x83, 0x34, 0x19, 0x80, 0xd5, 0x0b, 0x3c,
+	0xf3, 0xe5, 0x38, 0xc5, 0x3e, 0x93, 0x4d, 0xd8, 0x66, 0xb2, 0x9b, 0x47, 0x8f, 0x21, 0x2f, 0x08,
+	0x58, 0x57, 0xb7, 0xc5, 0xd1, 0x39, 0x0e, 0xe8, 0xd1, 0x31, 0xd2, 0xa0, 0x34, 0x5b, 0x4c, 0x7d,
+	0xca, 0x90, 0x5c, 0x21, 0x51, 0xda, 0x0a, 0x1c, 0xd8, 0xa3, 0x63, 0xa6, 0xd2, 0x23, 0xc8, 0xd9,
+	0x8e, 0x45, 0xcc, 0xf9, 0x62, 0xc0, 0x2b, 0x5b, 0xd1, 0xd8, 0x62, 0xeb, 0xf3, 0xc5, 0x00, 0x7d,
+	0x0c, 0x79, 0x8e, 0xc2, 0x96, 0xe5, 0x96, 0x21, 0x7e, 0x13, 0x74, 0x1c, 0x8b, 0x54, 0x2d, 0xcb,
+	0x25, 0x9e, 0x67, 0x70, 0x01, 0x6c, 0xc1, 0xb4, 0x19, 0x4e, 0xb0, 0x6d, 0xfa, 0xb7, 0x73, 0x52,
+	0x2e, 0x72, 0xf3, 0x72, 0x0c, 0xd0, 0xbf, 0x9d, 0xb3, 0xd9, 0xe8, 0xf1, 0x68, 0x21, 0xe2, 0x66,
+	0x5d, 0xfd, 0x2e, 0x71, 0xab, 0x1f, 0x4a, 0x92, 0x66, 0xbc, 0x8c, 0xbf, 0xcc, 0xe4, 0x32, 0x6a,
+	0xf6, 0x65, 0x26, 0x97, 0x55, 0x37, 0x5f, 0x66, 0x72, 0x05, 0xb5, 0xa8, 0xfd, 0x41, 0x81, 0x7c,
+	0x18, 0xf2, 0xe8, 0xc7, 0xe1, 0x74, 0x24, 0xd3, 0x62, 0x2f, 0x9e, 0x16, 0xa2, 0xb2, 0x06, 0x34,
+	0xec, 0x6e, 0x9c, 0x51, 0xdb, 0xb4, 0x16, 0x2e, 0x1f, 0xed, 0xcd, 0xc1, 0xd4, 0x19, 0xf2, 0x1c,
+	0xe7, 0x77, 0xe3, 0x8c, 0xda, 0x0d, 0x89, 0xa9, 0x71, 0x04, 0x2a, 0xc3, 0x56, 0x50, 0xfe, 0xc5,
+	0x18, 0x1b, 0x2c, 0x5f, 0x66, 0x72, 0x69, 0x35, 0xa3, 0xfd, 0x3e, 0x54, 0x86, 0x65, 0xfd, 0x77,
+	0x50, 0x06, 0xdf, 0xac, 0x28, 0x93, 0x91, 0xca, 0xe0, 0x9b, 0xbb, 0x95, 0xc9, 0xc6, 0x94, 0xd1,
+	0x8e, 0xa1, 0x10, 0x99, 0xea, 0xde, 0x3e, 0x0b, 0xfe, 0x55, 0x81, 0x62, 0x74, 0x24, 0x7d, 0x2b,
+	0x07, 0xfa, 0x05, 0x14, 0x46, 0x98, 0x4e, 0xcd, 0x48, 0xbb, 0xbe, 0x7d, 0xf2, 0x74, 0xdd, 0x78,
+	0x7b, 0xdc, 0xc4, 0x74, 0x1a, 0xf4, 0xe2, 0xa3, 0xf0, 0x9b, 0x6d, 0xc1, 0x25, 0x78, 0x3e, 0x6b,
+	0x3f, 0x78, 0xb0, 0xe7, 0x05, 0x41, 0x8f, 0x43, 0xb4, 0x03, 0x80, 0x25, 0x2b, 0xda, 0x81, 0x42,
+	0xbb, 0x73, 0x59, 0x3d, 0x6d, 0x37, 0xcc, 0xea, 0x59, 0x5f, 0xdd, 0xd0, 0x5e, 0x04, 0x19, 0xd7,
+	0xb6, 0xe7, 0x0b, 0x36, 0xbe, 0xe5, 0x82, 0x8a, 0x71, 0xe7, 0x2b, 0x47, 0x48, 0xa1, 0xfd, 0x0c,
+	0x8a, 0xf2, 0x08, 0x16, 0x3e, 0xe3, 0x0e, 0xfb, 0x64, 0x51, 0xe8, 0xc4, 0x82, 0x8d, 0x23, 0xb1,
+	0xf7, 0x0f, 0xb9, 0xd2, 0xbe, 0x4d, 0x41, 0x45, 0xb0, 0x9f, 0x39, 0x16, 0x1d, 0xdd, 0x26, 0x5e,
+	0x5d, 0xde, 0x92, 0xfc, 0x27, 0x00, 0x36, 0xb9, 0x36, 0x29, 0x53, 0x3b, 0xb8, 0x4e, 0x12, 0x81,
+	0xc1, 0x4d, 0x32, 0xf2, 0x36, 0xb9, 0xe6, 0x5f, 0xec, 0x12, 0x2a, 0x30, 0x1e, 0x87, 0x6b, 0x1b,
+	0xb4, 0x63, 0xfb, 0x89, 0x68, 0xe2, 0x48, 0x83, 0x09, 0x17, 0x9f, 0x1e, 0xba, 0x14, 0x5b, 0xcd,
+	0xb1, 0x8b, 0x67, 0x9e, 0xec, 0xc3, 0x3e, 0x8b, 0x73, 0xad, 0xb3, 0xe0, 0xb8, 0x43, 0xae, 0x25,
+	0xe4, 0x9c, 0xb1, 0x12, 0x9f, 0xb8, 0x1e, 0x57, 0x87, 0x2f, 0xbd, 0xca, 0x73, 0xd8, 0x5f, 0x47,
+	0xb2, 0xde, 0x8d, 0xda, 0x97, 0xf0, 0x78, 0xed, 0x5e, 0xf2, 0xad, 0xe4, 0x29, 0x14, 0x22, 0x53,
+	0x51, 0x10, 0x6b, 0xcb, 0x59, 0x47, 0xfb, 0x02, 0xde, 0x8b, 0xe4, 0x8b, 0xb8, 0x43, 0xde, 0xf5,
+	0x95, 0xe3, 0x9b, 0xe0, 0x89, 0x24, 0xca, 0x2b, 0x37, 0x3e, 0x82, 0xac, 0xb8, 0xb8, 0x14, 0x1e,
+	0xbd, 0x28, 0xd6, 0x64, 0x0b, 0x52, 0x41, 0xc0, 0xfa, 0x52, 0x71, 0x87, 0x2e, 0xec, 0xd1, 0x62,
+	0x1a, 0xbb, 0x48, 0x55, 0x8e, 0xb8, 0x58, 0xc2, 0xb5, 0x5d, 0xd8, 0x69, 0x12, 0xf2, 0xcb, 0x85,
+	0x13, 0xaa, 0xa9, 0x9d, 0x81, 0xba, 0x04, 0xc9, 0xdd, 0x57, 0xda, 0x64, 0xe5, 0x5d, 0xdb, 0x64,
+	0xad, 0x06, 0xfb, 0x06, 0x99, 0x92, 0x37, 0xd8, 0xf6, 0x6b, 0x62, 0xec, 0x15, 0xde, 0xd8, 0x86,
+	0x54, 0xd8, 0xd7, 0xa5, 0xa8, 0x85, 0x2a, 0xfc, 0x21, 0x49, 0x74, 0xf0, 0x29, 0x3e, 0xb7, 0x87,
+	0x6b, 0xed, 0x1f, 0x69, 0x28, 0xc5, 0x84, 0x44, 0xcb, 0x89, 0x12, 0x2b, 0x27, 0x52, 0x6e, 0x2a,
+	0x94, 0xfb, 0xbf, 0x4e, 0x08, 0xdd, 0x95, 0x31, 0x27, 0xc3, 0xb9, 0x8f, 0x02, 0xee, 0x98, 0x62,
+	0xdf, 0x7d, 0xc4, 0xc9, 0xde, 0x35, 0xe2, 0xac, 0xf8, 0x7e, 0xf3, 0x9d, 0x47, 0x94, 0x43, 0x28,
+	0x44, 0x87, 0x13, 0x71, 0xd5, 0x46, 0x41, 0x77, 0xcd, 0x25, 0xb9, 0xb5, 0x73, 0xc9, 0xff, 0x6d,
+	0x62, 0x68, 0x40, 0x31, 0x6a, 0x85, 0xe8, 0xfc, 0x3d, 0x12, 0x46, 0x5a, 0x86, 0x75, 0xfe, 0x1e,
+	0x91, 0xa8, 0x40, 0x61, 0x2e, 0x3d, 0x63, 0x6c, 0x49, 0x2d, 0x59, 0x91, 0x8d, 0xdc, 0xf0, 0x2c,
+	0x44, 0x6c, 0xe2, 0x5f, 0x3b, 0xee, 0x95, 0x54, 0x2d, 0x58, 0x22, 0x04, 0x19, 0xde, 0x1e, 0x88,
+	0x77, 0x1b, 0xfe, 0xad, 0x55, 0x21, 0x17, 0x94, 0x5e, 0x86, 0xe7, 0x73, 0x85, 0x08, 0x4e, 0xfe,
+	0xcd, 0x3a, 0x53, 0x51, 0xd0, 0x64, 0xe3, 0x27, 0x3b, 0x53, 0x01, 0xe3, 0x6d, 0xdf, 0x87, 0x7f,
+	0x52, 0x00, 0x96, 0xe9, 0xc8, 0xfa, 0xfc, 0xae, 0xd1, 0x60, 0x6d, 0xfe, 0x45, 0xed, 0xac, 0xdd,
+	0x17, 0x5d, 0xdd, 0x2e, 0x94, 0x04, 0xb0, 0x7e, 0xaa, 0x57, 0x0d, 0xbd, 0x21, 0x9e, 0x6c, 0x04,
+	0xe8, 0xbc, 0x6a, 0xf4, 0xdb, 0x55, 0xd6, 0xa9, 0x35, 0xdb, 0xa7, 0xa7, 0x7a, 0x43, 0x4d, 0x21,
+	0x04, 0xdb, 0x02, 0xa7, 0xbf, 0xd6, 0xeb, 0x17, 0x4c, 0x44, 0x7a, 0x09, 0xab, 0x57, 0x3b, 0x75,
+	0x9d, 0xd1, 0x65, 0x96, 0x62, 0xf5, 0xd7, 0xe7, 0x6d, 0x26, 0x36, 0x8b, 0x54, 0x28, 0x0a, 0x50,
+	0xb3, 0xda, 0x66, 0x44, 0x9b, 0x27, 0xff, 0xce, 0xc2, 0x6e, 0x7d, 0x82, 0x6d, 0x9b, 0x4c, 0xab,
+	0xe1, 0x13, 0x3e, 0x8b, 0xef, 0xf8, 0x0f, 0x00, 0xe8, 0x60, 0x19, 0xd9, 0x6b, 0x7e, 0x31, 0xa8,
+	0x7c, 0xef, 0x2e, 0xb4, 0xac, 0x15, 0x06, 0x14, 0x22, 0x0f, 0xdf, 0xe8, 0x30, 0x79, 0x5b, 0x24,
+	0x1f, 0xfe, 0x2b, 0xcf, 0xee, 0xa1, 0x90, 0x32, 0x5f, 0x43, 0x29, 0x56, 0x8f, 0x91, 0xf6, 0xf6,
+	0x8b, 0xa1, 0xf2, 0xfe, 0xbd, 0x34, 0x4b, 0x6d, 0x23, 0x6f, 0xe2, 0x49, 0x6d, 0x57, 0x1f, 0xe9,
+	0x93, 0xda, 0xae, 0x7b, 0x50, 0x37, 0xe2, 0x1d, 0x4d, 0x42, 0xe6, 0xea, 0xfb, 0x77, 0x52, 0xe6,
+	0x9a, 0x47, 0x6e, 0xd4, 0x8d, 0xc5, 0xd6, 0xd3, 0x35, 0xbd, 0x59, 0xf4, 0xae, 0xa9, 0x1c, 0xde,
+	0x4d, 0x20, 0x05, 0x7e, 0x05, 0x0f, 0xc2, 0xf9, 0x95, 0x97, 0x2e, 0x19, 0x13, 0x28, 0x1c, 0x6f,
+	0xd7, 0xbd, 0xa9, 0x57, 0x9e, 0x24, 0xe6, 0xc1, 0x18, 0xf6, 0x48, 0xf9, 0x58, 0x41, 0x3f, 0x87,
+	0x5c, 0x70, 0x7f, 0xa0, 0xf0, 0x31, 0x2e, 0x71, 0xc9, 0x54, 0xca, 0xab, 0x08, 0xa9, 0xd7, 0x29,
+	0x3c, 0x88, 0x55, 0xd4, 0x9e, 0x8d, 0xe7, 0xde, 0xc4, 0xf1, 0x97, 0x7a, 0xad, 0xbb, 0x4e, 0x2a,
+	0x0f, 0xd6, 0x62, 0x07, 0x9b, 0xfc, 0xe7, 0xaf, 0x4f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xea,
+	0xb2, 0xa1, 0xcf, 0x38, 0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/clmrpc/auctioneer.proto b/clmrpc/auctioneer.proto
index 56dca43..d7c0301 100644
--- a/clmrpc/auctioneer.proto
+++ b/clmrpc/auctioneer.proto
@@ -36,45 +36,45 @@ message ReserveAccountResponse {
 }
 
 message ServerInitAccountRequest {
-    /**
+    /*
     Transaction output of the account. Has to be unspent and be a P2WSH of
     the account script below. The amount must also exactly correspond to the
     account value below.
     */
     OutPoint account_point = 1;
 
-    /**
+    /*
     The script used to create the account point.
     */
     bytes account_script = 2;
 
-    /**
+    /*
     The value of the account in satoshis. Must match the amount of the
     account_point output.
     */
-    uint32 account_value = 3;
+    uint64 account_value = 3;
 
-    /**
+    /*
     The block height at which the account should expire.
     */
     uint32 account_expiry = 4;
 
-    /**
-    The user's sub account key.
+    /*
+    The trader's account key.
     */
-    bytes user_sub_key = 5;
+    bytes trader_key = 5;
 }
 message ServerInitAccountResponse {
 }
 
 message ServerSubmitOrderRequest {
     oneof details {
-        /**
+        /*
         Submit an ask order.
         */
         ServerAsk ask = 1;
 
-        /**
+        /*
         Submit a bid order.
         */
         ServerBid bid = 2;
@@ -82,12 +82,12 @@ message ServerSubmitOrderRequest {
 }
 message ServerSubmitOrderResponse {
     oneof details {
-        /**
+        /*
         Order failed with the given reason.
         */
         InvalidOrder invalid_order = 1;
 
-        /**
+        /*
         Order was accepted.
         */
         bool accepted = 2;
@@ -95,7 +95,7 @@ message ServerSubmitOrderResponse {
 }
 
 message ServerCancelOrderRequest {
-    /**
+    /*
     The order's unique 32 byte identifier.
     */
     bytes order_nonce = 1;
@@ -105,31 +105,31 @@ message ServerCancelOrderResponse {
 
 message ClientAuctionMessage {
     oneof msg {
-        /**
+        /*
         Signal the intent to receive updates about a certain account and start
         by sending the commitment part of the authentication handshake. This is
         step 1 of the 3-way handshake.
         */
         AccountCommitment commit = 1;
 
-        /**
+        /*
         Subscribe to update and interactive order execution events for account
         given and all its orders. Contains the final signature and is step 3 of
         the 3-way authentication handshake.
         */
         AccountSubscription subscribe = 2;
 
-        /**
+        /*
         Accept the orders to be matched.
         */
         OrderMatchAccept accept = 3;
 
-        /**
+        /*
         Reject a whole batch.
         */
         OrderMatchReject reject = 4;
 
-        /**
+        /*
         The channel funding negotiations with the matched peer were successful
         and the inputs to spend from the accounts are now signed.
         */
@@ -138,13 +138,13 @@ message ClientAuctionMessage {
 }
 
 message AccountCommitment {
-    /**
-    The SHA256 hash of the user's account sub key and a 32 byte random nonce.
+    /*
+    The SHA256 hash of the trader's account key and a 32 byte random nonce.
     commit_hash = SHA256(accountPubKey || nonce)
     */
     bytes commit_hash = 1;
 
-    /**
+    /*
     The batch verification protocol version the client is using. Clients that
     don't use the latest version will be declined to connect and participate in
     an auction. The user should then be informed that a software update is
@@ -154,19 +154,19 @@ message AccountCommitment {
 }
 
 message AccountSubscription {
-    /**
-    The user's sub account key of the account to subscribe to.
+    /*
+    The trader's account key of the account to subscribe to.
     */
-    bytes user_sub_key = 1;
+    bytes trader_key = 1;
 
-    /**
+    /*
     The random 32 byte nonce the trader used to create the commitment hash.
     */
     bytes commit_nonce = 2;
 
-    /**
+    /*
     The signature over the auth_hash which is the hash of the commitment and
-    challenge. The signature is created with the user's sub account key they
+    challenge. The signature is created with the trader's account key they
     committed to.
     auth_hash = SHA256(SHA256(accountPubKey || nonce) || challenge)
     */
@@ -174,7 +174,7 @@ message AccountSubscription {
 }
 
 message OrderMatchAccept {
-    /**
+    /*
     A list of all order nonces of the orders that are accepted by the trader to
     be matched by the auctioneer. Orders that didn't have all their units
     fulfilled need to be tracked by the trader locally by applying all diffs
@@ -182,7 +182,7 @@ message OrderMatchAccept {
     */
     repeated bytes order_nonce = 1;
 
-    /**
+    /*
     The batch ID this acceptance message refers to. Must be set to avoid out-of-
     order responses from disrupting the batching process.
     */
@@ -191,64 +191,64 @@ message OrderMatchAccept {
 
 message OrderMatchReject {
     enum RejectReason {
-        /// The reason cannot be mapped to a specific code.
+        // The reason cannot be mapped to a specific code.
         UNKNOWN = 0;
 
-        /**
+        /*
         The client didn't come up with the same result as the server and is
         rejecting the batch because of that.
         */
         SERVER_MISBEHAVIOR = 1;
 
-        /**
+        /*
         The client doesn't support the current batch verification version the
         server is using.
         */
         BATCH_VERSION_MISMATCH = 2;
     }
 
-    /**
+    /*
     The ID of the batch to reject.
     */
     bytes batch_id = 1;
 
-    /**
+    /*
     The reason/error string for the rejection.
     */
     string reason = 2;
 
-    /**
+    /*
     The reason as a code.
     */
     RejectReason reason_code = 3;
 }
 
 message OrderMatchSign {
-    /**
+    /*
     The ID of the batch that the signatures are meant for.
     */
     bytes batch_id = 1;
 
-    /**
+    /*
     A map with the signatures to spend the accounts being spent in a batch
-    transaction. The map key corresponds to the user's sub key of the account
-    in the batch transaction. The account key/ID has to be hex encoded into a
-    string because protobuf doesn't allow bytes as a map key data type.
+    transaction. The map key corresponds to the trader's account key of the
+    account in the batch transaction. The account key/ID has to be hex encoded
+    into a string because protobuf doesn't allow bytes as a map key data type.
     */
     map<string, bytes> account_sigs = 2;
 }
 
 message ServerAuctionMessage {
     oneof msg {
-        /**
+        /*
         Step 2 of the 3-way authentication handshake. Contains the
         authentication challenge. Subscriptions sent by the trader must sign
         the message SHA256(SHA256(accountPubKey || nonce) || challenge)
-        with their account sub key to prove ownership of said key.
+        with their account key to prove ownership of said key.
         */
         ServerChallenge challenge = 1;
 
-        /**
+        /*
         The auctioneer has matched a set of orders into a batch and now
         instructs the traders to validate the batch and prepare for order
         execution. Because traders have the possibility of backing out of a
@@ -256,20 +256,20 @@ message ServerAuctionMessage {
         */
         OrderMatchPrepare prepare = 2;
 
-        /**
+        /*
         This message is sent after all traders send back an OrderMatchAccept
         method. It signals that the traders should execute their local funding
         protocol, then send signatures for their accout inputs.
         */
         OrderMatchSignBegin sign = 3;
 
-        /**
+        /*
         All traders have accepted and signed the batch and the final transaction
         was broadcast.
         */
         OrderMatchFinalize finalize = 4;
 
-        /**
+        /*
         An error occurred during any part of the communication. The trader
         should inspect the error code and act accordingly.
         */
@@ -278,67 +278,67 @@ message ServerAuctionMessage {
 }
 
 message ServerChallenge {
-    /**
-    The unique challenge for each stream that has to be signed with the user's
-    sub key for each account subscription.
+    /*
+    The unique challenge for each stream that has to be signed with the trader's
+    account key for each account subscription.
     */
     bytes challenge = 1;
 
-    /**
+    /*
     The commit hash the challenge was created for.
     */
     bytes commit_hash = 2;
 }
 
 message OrderMatchPrepare {
-    /**
+    /*
     Maps a user's own order_nonce to the opposite order type they were matched
     with. The order_nonce is a 32 byte hex encoded string because bytes is not
     allowed as a map key data type in protobuf.
     */
     map<string, MatchedOrder> matched_orders = 1;
 
-    /**
+    /*
     The uniform clearing price rate in parts per million that was used for this
     batch.
     */
     uint32 clearing_price_rate = 2;
 
-    /**
+    /*
     A list of the user's own accounts that are being spent by the matched
     orders. The list contains the differences that would be applied by the
     server when executing the orders.
     */
     repeated AccountDiff charged_accounts = 3;
 
-    /**
+    /*
     The fee parameters used to calculate the execution fees.
     */
     ExecutionFee execution_fee = 4;
 
-    /**
+    /*
     The batch transaction with all non-witness data.
     */
     bytes batch_transaction = 5;
 
-    /**
+    /*
     Fee rate of the batch transaction, expressed in satoshis per 1000 weight
     units (sat/kW).
     */
-    int64 fee_rate_sat_per_kw = 6;
+    uint64 fee_rate_sat_per_kw = 6;
 
-    /**
+    /*
     Fee rebate in satoshis, offered if another batch participant wants to pay
     more fees for a faster confirmation.
     */
-    int64 fee_rebate_sat = 7;
+    uint64 fee_rebate_sat = 7;
 
-    /**
+    /*
     The 32 byte unique identifier of this batch.
     */
     bytes batch_id = 8;
 
-    /**
+    /*
     The batch verification protocol version the server is using. Clients that
     don't support this version MUST return an `OrderMatchAccept` message with
     an empty list of orders so the batch can continue. The user should then be
@@ -348,24 +348,24 @@ message OrderMatchPrepare {
 }
 
 message OrderMatchSignBegin {
-    /**
+    /*
     The 32 byte unique identifier of this batch.
     */
     bytes batch_id = 1;
 }
 
 message OrderMatchFinalize {
-    /**
+    /*
     The unique identifier of the finalized batch.
     */
     bytes batch_id = 1;
 
-    /**
+    /*
     The final transaction ID of the published batch transaction.
     */
     bytes batch_txid = 2;
 
-    /**
+    /*
     The current block height at the time the batch transaction was published to
     the network.
     */
@@ -374,37 +374,37 @@ message OrderMatchFinalize {
 
 message SubscribeError {
     enum Error {
-        /**
+        /*
         The error cannot be mapped to a specific code.
         */
         UNKNOWN = 0;
 
-        /**
+        /*
         The server is shutting down for maintenance. Traders should close the
         long-lived stream/connection and try to connect again after some time.
         */
         SERVER_SHUTDOWN = 1;
     }
 
-    /**
+    /*
     The string representation of the subscription error.
     */
     string error = 1;
 
-    /**
+    /*
     The error code of the subscription error.
     */
     Error error_code = 2;
 }
 
 message MatchedOrder {
-    /**
+    /*
     The bids the trader's own order was matched against. This list is empty if
     the trader's order was a bid order itself.
     */
     repeated MatchedBid matched_bids = 1;
 
-    /**
+    /*
     The asks the trader's own order was matched against. This list is empty if
     the trader's order was an ask order itself.
     */
@@ -412,23 +412,23 @@ message MatchedOrder {
 }
 
 message MatchedAsk {
-    /**
+    /*
     The ask order that was matched against.
     */
     ServerAsk ask = 1;
 
-    /**
+    /*
     The number of units that were filled from/by this matched order.
     */
     uint32 units_filled = 2;
 }
 message MatchedBid {
-    /**
+    /*
     The ask order that was matched against.
     */
     ServerBid bid = 1;
 
-    /**
+    /*
     The number of units that were filled from/by this matched order.
     */
     uint32 units_filled = 2;
@@ -442,19 +442,19 @@ message AccountDiff {
         OUTPUT_FULLY_SPENT = 3;
     }
 
-    /**
+    /*
     The final balance of the account after the executed batch.
     */
-    int64 ending_balance = 1;
+    uint64 ending_balance = 1;
 
-    /**
+    /*
     Depending on the amount of the final balance of the account, the remainder
     is either sent to a new on-chain output, extended off-chain or fully
     consumed by the batch and its fees.
     */
     AccountState ending_state = 2;
 
-    /**
+    /*
     If the account was re-created on-chain then the new account's index in the
     transaction is set here. If the account was fully spent or the remainder was
     extended off-chain then no new account outpoint is created and -1 is
@@ -462,39 +462,39 @@ message AccountDiff {
     */
     int32 outpoint_index = 3;
 
-    /**
-    The user's sub account key this diff is referring to.
+    /*
+    The trader's account key this diff is referring to.
     */
-    bytes user_sub_key = 4;
+    bytes trader_key = 4;
 }
 
 message ServerOrder {
-    /**
-    The user's sub key of the account to use for the order.
+    /*
+    The trader's account key of the account to use for the order.
     */
-    bytes user_sub_key = 1;
+    bytes trader_key = 1;
 
-    /**
+    /*
     Fixed order rate in parts per million.
     */
-    int64 rate_fixed = 2;
+    uint32 rate_fixed = 2;
 
-    /**
+    /*
     Order amount in satoshis.
     */
-    int64 amt = 3;
+    uint64 amt = 3;
 
     // TODO(guggero): implement
     // bool kill_or_fill = 4;
     // repeated bytes must_fill_pub = 5;
     reserved 4, 5;
 
-    /**
+    /*
     Order nonce of 32 byte length, acts as unique order identifier.
     */
     bytes order_nonce = 6;
 
-    /**
+    /*
     Signature of the order's digest, signed with the user's account key. The
     signature must be fixed-size LN wire format encoded. Version 0 includes the
     fields version, rate_fixed, amt, funding_fee_rate_sat_per_kw and
@@ -502,18 +502,18 @@ message ServerOrder {
     */
     bytes order_sig = 7;
 
-    /**
+    /*
     The multi signature key of the node creating the order, will be used for the
     target channel's funding TX 2-of-2 multi signature output. 
     */
     bytes multi_sig_key = 8;
 
-    /**
+    /*
     The pubkey of the node creating the order.
     */
     bytes node_pub = 9;
 
-    /**
+    /*
     The network addresses of the node creating the order.
     */
     repeated NodeAddress node_addr = 10;
@@ -524,35 +524,35 @@ message ServerOrder {
     */
     reserved 11;
 
-    /**
+    /*
     The type of the channel that should be opened.
     */
     uint32 chan_type = 12;
 
-    /**
+    /*
     Preferred fee rate to be used for the channel funding transaction, expressed
     in satoshis per 1000 weight units (sat/kW).
     */
-    int64 funding_fee_rate_sat_per_kw = 13;
+    uint64 funding_fee_rate_sat_per_kw = 13;
 }
 
 message ServerBid {
-    /**
+    /*
     The common fields shared between both ask and bid order types.
     */
     ServerOrder details = 1;
 
-    /**
+    /*
     Required minimum number of blocks that a channel opened as a result of this
     bid should be kept open.
     */
-    int64 min_duration_blocks = 2;
+    uint32 min_duration_blocks = 2;
 
     // TODO(guggero): implement
     // bool instant = 3;
     reserved 3;
 
-    /**
+    /*
     The version of the order format that is used. Will be increased once new
     features are added.
     */
@@ -560,18 +560,18 @@ message ServerBid {
 }
 
 message ServerAsk {
-    /**
+    /*
     The common fields shared between both ask and bid order types.
     */
     ServerOrder details = 1;
 
-    /**
+    /*
     The maximum number of blocks the liquidity provider is willing to provide
     the channel funds for.
     */
-    int64 max_duration_blocks = 4;
+    uint32 max_duration_blocks = 4;
 
-    /**
+    /*
     The version of the order format that is used. Will be increased once new
     features are added.
     */
@@ -583,7 +583,6 @@ message CancelOrder {
 }
 
 message InvalidOrder {
-
     enum FailReason {
         INVALID_AMT = 0;
     }
@@ -600,18 +599,17 @@ message ServerInput {
 
 message ServerOutput {
     // The value, in satoshis, of the output.
-    uint32 value = 1 [json_name = "value"];
+    uint64 value = 1;
 
     // The script of the output to send the value to.
-    bytes script = 2 [json_name = "script"];
+    bytes script = 2;
 }
 
 message ServerModifyAccountRequest {
     /*
-    The user sub key that corresponds to the account to be modified. This is
-    also known as the trader key.
+    The trader's account key of the account to be modified.
     */
-    bytes user_sub_key = 1;
+    bytes trader_key = 1;
 
     /*
     An additional set of inputs that can be included in the spending transaction
@@ -629,7 +627,7 @@ message ServerModifyAccountRequest {
 
     message NewAccountParameters {
         // The new value of the account.
-        uint32 value = 1;
+        uint64 value = 1;
     }
 
     // The new parameters to apply for the account.
@@ -637,7 +635,7 @@ message ServerModifyAccountRequest {
 }
 
 message ServerModifyAccountResponse {
-    /**
+    /*
     The auctioneer's signature that allows a trader to broadcast a transaction
     spending from an account output.
     */
@@ -659,12 +657,12 @@ enum OrderState {
 }
 
 message ServerOrderStateResponse {
-    /**
+    /*
     The state the order currently is in.
     */
     OrderState state = 1;
 
-    /**
+    /*
     The number of currently unfilled units of this order. This will be equal to
     the total amount of units until the order has reached the state PARTIAL_FILL
     or EXECUTED.
@@ -676,7 +674,7 @@ message FeeQuoteRequest {
 }
 
 message FeeQuoteResponse {
-    /**
+    /*
     The execution fee charged per matched order.
     */
     ExecutionFee execution_fee = 1;
@@ -726,19 +724,19 @@ message RelevantBatch {
     Fee rate of the batch transaction, expressed in satoshis per 1000 weight
     units (sat/kW).
     */
-    uint32 fee_rate_sat_per_kw = 8;
+    uint64 fee_rate_sat_per_kw = 8;
 }
 
 message ExecutionFee {
-    /**
+    /*
     The base fee in satoshis charged per order, regardless of the matched size.
     */
-    int64 base_fee = 1;
+    uint64 base_fee = 1;
 
-    /**
+    /*
     The fee rate in parts per million 
     */
-    int64 fee_rate = 2;
+    uint64 fee_rate = 2;
 }
 
 message NodeAddress {
@@ -747,13 +745,13 @@ message NodeAddress {
 }
 
 message OutPoint {
-    /**
+    /*
     Raw bytes representing the transaction id.
     */
-    bytes txid = 1 [json_name = "txid"];
+    bytes txid = 1;
 
-    /**
+    /*
     The index of the output on the transaction.
     */
-    uint32 output_index = 2 [json_name = "output_index"];
+    uint32 output_index = 2;
 }
diff --git a/clmrpc/trader.pb.go b/clmrpc/trader.pb.go
index bd7dea8..9dad66b 100644
--- a/clmrpc/trader.pb.go
+++ b/clmrpc/trader.pb.go
@@ -74,7 +74,7 @@ func (AccountState) EnumDescriptor() ([]byte, []int) {
 }
 
 type InitAccountRequest struct {
-	AccountValue         uint32   `protobuf:"varint,1,opt,name=account_value,json=accountValue,proto3" json:"account_value,omitempty"`
+	AccountValue         uint64   `protobuf:"varint,1,opt,name=account_value,json=accountValue,proto3" json:"account_value,omitempty"`
 	AccountExpiry        uint32   `protobuf:"varint,2,opt,name=account_expiry,json=accountExpiry,proto3" json:"account_expiry,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -106,7 +106,7 @@ func (m *InitAccountRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_InitAccountRequest proto.InternalMessageInfo
 
-func (m *InitAccountRequest) GetAccountValue() uint32 {
+func (m *InitAccountRequest) GetAccountValue() uint64 {
 	if m != nil {
 		return m.AccountValue
 	}
@@ -192,7 +192,7 @@ func (m *ListAccountsResponse) GetAccounts() []*Account {
 
 type Output struct {
 	// The value, in satoshis, of the output.
-	Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 	// The address corresponding to the output.
 	Address              string   `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -225,7 +225,7 @@ func (m *Output) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Output proto.InternalMessageInfo
 
-func (m *Output) GetValue() uint32 {
+func (m *Output) GetValue() uint64 {
 	if m != nil {
 		return m.Value
 	}
@@ -241,7 +241,7 @@ func (m *Output) GetAddress() string {
 
 type CloseAccountRequest struct {
 	// The trader key associated with the account that will be closed.
-	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,proto3" json:"trader_key,omitempty"`
+	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
 	//
 	//The outputs that should be created as a result of closing the account. If
 	//none are specified, then the funds within the account are sent to an address
@@ -293,7 +293,7 @@ func (m *CloseAccountRequest) GetOutputs() []*Output {
 
 type CloseAccountResponse struct {
 	// The hash of the closing transaction.
-	CloseTxid            []byte   `protobuf:"bytes,1,opt,name=close_txid,proto3" json:"close_txid,omitempty"`
+	CloseTxid            []byte   `protobuf:"bytes,1,opt,name=close_txid,json=closeTxid,proto3" json:"close_txid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -340,7 +340,7 @@ type WithdrawAccountRequest struct {
 	Outputs []*Output `protobuf:"bytes,2,rep,name=outputs,proto3" json:"outputs,omitempty"`
 	//
 	//The fee rate, in satoshis per vbyte, to use for the withdrawal transaction.
-	SatPerByte           uint32   `protobuf:"varint,3,opt,name=sat_per_byte,json=satPerByte,proto3" json:"sat_per_byte,omitempty"`
+	SatPerVbyte          uint64   `protobuf:"varint,3,opt,name=sat_per_vbyte,json=satPerVbyte,proto3" json:"sat_per_vbyte,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -385,9 +385,9 @@ func (m *WithdrawAccountRequest) GetOutputs() []*Output {
 	return nil
 }
 
-func (m *WithdrawAccountRequest) GetSatPerByte() uint32 {
+func (m *WithdrawAccountRequest) GetSatPerVbyte() uint64 {
 	if m != nil {
-		return m.SatPerByte
+		return m.SatPerVbyte
 	}
 	return 0
 }
@@ -451,7 +451,7 @@ type Account struct {
 	//time the account has been updated.
 	Outpoint *OutPoint `protobuf:"bytes,2,opt,name=outpoint,proto3" json:"outpoint,omitempty"`
 	// The current value in satoshis of the account.
-	Value uint32 `protobuf:"varint,3,opt,name=value,proto3" json:"value,omitempty"`
+	Value uint64 `protobuf:"varint,3,opt,name=value,proto3" json:"value,omitempty"`
 	// The height at which the account will expire.
 	ExpirationHeight uint32 `protobuf:"varint,4,opt,name=expiration_height,json=expirationHeight,proto3" json:"expiration_height,omitempty"`
 	// The current state of the account.
@@ -502,7 +502,7 @@ func (m *Account) GetOutpoint() *OutPoint {
 	return nil
 }
 
-func (m *Account) GetValue() uint32 {
+func (m *Account) GetValue() uint64 {
 	if m != nil {
 		return m.Value
 	}
@@ -839,33 +839,33 @@ func (m *CancelOrderResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_CancelOrderResponse proto.InternalMessageInfo
 
 type Order struct {
-	//*
-	//The user's sub key of the account that is used for the order.
-	UserSubKey []byte `protobuf:"bytes,1,opt,name=user_sub_key,proto3" json:"user_sub_key,omitempty"`
-	//*
+	//
+	//The trader's account key of the account that is used for the order.
+	TraderKey []byte `protobuf:"bytes,1,opt,name=trader_key,json=traderKey,proto3" json:"trader_key,omitempty"`
+	//
 	//Fixed order rate in parts per million.
-	RateFixed int64 `protobuf:"varint,2,opt,name=rate_fixed,proto3" json:"rate_fixed,omitempty"`
-	//*
+	RateFixed uint32 `protobuf:"varint,2,opt,name=rate_fixed,json=rateFixed,proto3" json:"rate_fixed,omitempty"`
+	//
 	//Order amount in satoshis.
-	Amt int64 `protobuf:"varint,3,opt,name=amt,proto3" json:"amt,omitempty"`
-	//*
+	Amt uint64 `protobuf:"varint,3,opt,name=amt,proto3" json:"amt,omitempty"`
+	//
 	//Preferred fee rate to be used for the channel funding transaction, expressed
 	//in satoshis per 1000 weight units (sat/kW).
-	FundingFeeRate int64 `protobuf:"varint,4,opt,name=funding_fee_rate,proto3" json:"funding_fee_rate,omitempty"`
-	//*
+	FundingFeeRate uint64 `protobuf:"varint,4,opt,name=funding_fee_rate,json=fundingFeeRate,proto3" json:"funding_fee_rate,omitempty"`
+	//
 	//Order nonce, acts as unique order identifier.
-	OrderNonce []byte `protobuf:"bytes,5,opt,name=order_nonce,proto3" json:"order_nonce,omitempty"`
-	//*
+	OrderNonce []byte `protobuf:"bytes,5,opt,name=order_nonce,json=orderNonce,proto3" json:"order_nonce,omitempty"`
+	//
 	//The state the order currently is in.
 	State string `protobuf:"bytes,6,opt,name=state,proto3" json:"state,omitempty"`
-	//*
+	//
 	//The number of order units the amount corresponds to.
 	Units uint32 `protobuf:"varint,7,opt,name=units,proto3" json:"units,omitempty"`
-	//*
+	//
 	//The number of currently unfilled units of this order. This will be equal to
 	//the total amount of units until the order has reached the state PARTIAL_FILL
 	//or EXECUTED.
-	UnitsUnfulfilled     uint32   `protobuf:"varint,8,opt,name=units_unfulfilled,proto3" json:"units_unfulfilled,omitempty"`
+	UnitsUnfulfilled     uint32   `protobuf:"varint,8,opt,name=units_unfulfilled,json=unitsUnfulfilled,proto3" json:"units_unfulfilled,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -896,28 +896,28 @@ func (m *Order) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Order proto.InternalMessageInfo
 
-func (m *Order) GetUserSubKey() []byte {
+func (m *Order) GetTraderKey() []byte {
 	if m != nil {
-		return m.UserSubKey
+		return m.TraderKey
 	}
 	return nil
 }
 
-func (m *Order) GetRateFixed() int64 {
+func (m *Order) GetRateFixed() uint32 {
 	if m != nil {
 		return m.RateFixed
 	}
 	return 0
 }
 
-func (m *Order) GetAmt() int64 {
+func (m *Order) GetAmt() uint64 {
 	if m != nil {
 		return m.Amt
 	}
 	return 0
 }
 
-func (m *Order) GetFundingFeeRate() int64 {
+func (m *Order) GetFundingFeeRate() uint64 {
 	if m != nil {
 		return m.FundingFeeRate
 	}
@@ -953,14 +953,14 @@ func (m *Order) GetUnitsUnfulfilled() uint32 {
 }
 
 type Bid struct {
-	//*
+	//
 	//The common fields shared between both ask and bid order types.
 	Details *Order `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
-	//*
+	//
 	//Required minimum number of blocks that a channel opened as a result of this
 	//bid should be kept open.
-	MinDurationBlocks int64 `protobuf:"varint,2,opt,name=min_duration_blocks,proto3" json:"min_duration_blocks,omitempty"`
-	//*
+	MinDurationBlocks uint32 `protobuf:"varint,2,opt,name=min_duration_blocks,json=minDurationBlocks,proto3" json:"min_duration_blocks,omitempty"`
+	//
 	//The version of the order format that is used. Will be increased once new
 	//features are added.
 	Version              uint32   `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
@@ -1001,7 +1001,7 @@ func (m *Bid) GetDetails() *Order {
 	return nil
 }
 
-func (m *Bid) GetMinDurationBlocks() int64 {
+func (m *Bid) GetMinDurationBlocks() uint32 {
 	if m != nil {
 		return m.MinDurationBlocks
 	}
@@ -1016,14 +1016,14 @@ func (m *Bid) GetVersion() uint32 {
 }
 
 type Ask struct {
-	//*
+	//
 	//The common fields shared between both ask and bid order types.
 	Details *Order `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
-	//*
+	//
 	//The maximum number of blocks the liquidity provider is willing to provide
 	//the channel funds for.
-	MaxDurationBlocks int64 `protobuf:"varint,2,opt,name=max_duration_blocks,proto3" json:"max_duration_blocks,omitempty"`
-	//*
+	MaxDurationBlocks uint32 `protobuf:"varint,2,opt,name=max_duration_blocks,json=maxDurationBlocks,proto3" json:"max_duration_blocks,omitempty"`
+	//
 	//The version of the order format that is used. Will be increased once new
 	//features are added.
 	Version              uint32   `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
@@ -1064,7 +1064,7 @@ func (m *Ask) GetDetails() *Order {
 	return nil
 }
 
-func (m *Ask) GetMaxDurationBlocks() int64 {
+func (m *Ask) GetMaxDurationBlocks() uint32 {
 	if m != nil {
 		return m.MaxDurationBlocks
 	}
@@ -1103,77 +1103,77 @@ func init() {
 func init() { proto.RegisterFile("trader.proto", fileDescriptor_b8f61804588c75fe) }
 
 var fileDescriptor_b8f61804588c75fe = []byte{
-	// 1109 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdf, 0x4e, 0x1b, 0xc7,
-	0x17, 0xc6, 0x18, 0xdb, 0xe4, 0x78, 0x21, 0xcb, 0xd8, 0xc9, 0xcf, 0x31, 0x04, 0xd0, 0xfe, 0x9a,
-	0x96, 0x9a, 0x08, 0x37, 0x54, 0xad, 0xaa, 0xf6, 0x8a, 0x3f, 0x56, 0x41, 0x8d, 0xc0, 0x5a, 0x68,
-	0x52, 0xa9, 0x17, 0xdb, 0xf1, 0xee, 0x00, 0x23, 0x2f, 0xbb, 0xee, 0xce, 0x2c, 0x81, 0x46, 0xb9,
-	0x69, 0x95, 0x07, 0xa8, 0xfa, 0x68, 0x7d, 0x85, 0x5c, 0xf7, 0x19, 0xaa, 0x99, 0x9d, 0xf1, 0x8e,
-	0xed, 0x45, 0x55, 0xee, 0xbc, 0xe7, 0x3b, 0x33, 0xdf, 0x77, 0xce, 0x9c, 0x3f, 0x06, 0x8b, 0x27,
-	0x38, 0x20, 0xc9, 0xce, 0x28, 0x89, 0x79, 0x8c, 0xaa, 0x7e, 0x78, 0x9d, 0x8c, 0xfc, 0xf6, 0xda,
-	0x65, 0x1c, 0x5f, 0x86, 0xa4, 0x8b, 0x47, 0xb4, 0x8b, 0xa3, 0x28, 0xe6, 0x98, 0xd3, 0x38, 0x62,
-	0x99, 0x57, 0xdb, 0xc6, 0xa9, 0x2f, 0xbe, 0x89, 0x3e, 0xe7, 0xfc, 0x02, 0xe8, 0x38, 0xa2, 0x7c,
-	0xcf, 0xf7, 0xe3, 0x34, 0xe2, 0x2e, 0xf9, 0x35, 0x25, 0x8c, 0xa3, 0xff, 0xc3, 0x12, 0xce, 0x2c,
-	0xde, 0x0d, 0x0e, 0x53, 0xd2, 0x2a, 0x6d, 0x96, 0xb6, 0x96, 0x5c, 0x4b, 0x19, 0x5f, 0x09, 0x1b,
-	0x7a, 0x06, 0xcb, 0xda, 0x89, 0xdc, 0x8e, 0x68, 0x72, 0xd7, 0x9a, 0x97, 0x5e, 0xfa, 0x68, 0x4f,
-	0x1a, 0x9d, 0x47, 0xd0, 0x78, 0x49, 0x99, 0x66, 0x60, 0x8a, 0xc2, 0x39, 0x80, 0xe6, 0xa4, 0x99,
-	0x8d, 0xe2, 0x88, 0x11, 0xb4, 0x0d, 0x8b, 0xea, 0x3c, 0x6b, 0x95, 0x36, 0xcb, 0x5b, 0xf5, 0xdd,
-	0x87, 0x3b, 0x59, 0x6c, 0x3b, 0x5a, 0xe4, 0xd8, 0xc1, 0xf9, 0x06, 0xaa, 0xa7, 0x29, 0x1f, 0xa5,
-	0x1c, 0x35, 0xa1, 0x62, 0x2a, 0xcd, 0x3e, 0x50, 0x0b, 0x6a, 0x38, 0x08, 0x12, 0xc2, 0x98, 0xd4,
-	0xf6, 0xc0, 0xd5, 0x9f, 0x8e, 0x07, 0x8d, 0x83, 0x30, 0x66, 0x64, 0x2a, 0xf0, 0x75, 0x80, 0x2c,
-	0xad, 0xde, 0x90, 0xdc, 0xc9, 0xbb, 0x2c, 0xd7, 0xb0, 0xa0, 0x2d, 0xa8, 0xc5, 0x92, 0x50, 0x5c,
-	0x28, 0xc4, 0x2d, 0x6b, 0x71, 0x99, 0x0e, 0x57, 0xc3, 0xce, 0xd7, 0xd0, 0x9c, 0x24, 0x50, 0xf1,
-	0xad, 0x03, 0xf8, 0xc2, 0xee, 0xf1, 0x5b, 0x1a, 0x68, 0x86, 0xdc, 0xe2, 0xfc, 0x51, 0x82, 0xc7,
-	0xaf, 0x29, 0xbf, 0x0a, 0x12, 0xfc, 0x66, 0x4a, 0xdc, 0xd3, 0x02, 0x71, 0x0f, 0x32, 0xcb, 0x0f,
-	0x1f, 0xa3, 0x0d, 0x6d, 0x82, 0xc5, 0x30, 0xf7, 0x46, 0x24, 0xf1, 0x06, 0x77, 0x9c, 0xb4, 0xca,
-	0x32, 0x67, 0xc0, 0x30, 0xef, 0x93, 0x64, 0xff, 0x8e, 0x13, 0x87, 0xc2, 0xff, 0x66, 0x44, 0xa8,
-	0x00, 0x3e, 0x87, 0x9a, 0xca, 0xbf, 0x94, 0x50, 0xf0, 0x3e, 0x1a, 0x17, 0x65, 0xf4, 0x46, 0xdd,
-	0x92, 0x85, 0x3b, 0x2f, 0x35, 0x5b, 0xda, 0x78, 0x2e, 0x02, 0xfe, 0x50, 0x82, 0x9a, 0x3a, 0xf9,
-	0x5f, 0x11, 0x3e, 0x87, 0x45, 0x11, 0x42, 0x4c, 0x23, 0x2e, 0xaf, 0xaa, 0xef, 0xda, 0x46, 0x88,
-	0x7d, 0x61, 0x77, 0xc7, 0x1e, 0x79, 0x49, 0x94, 0xcd, 0x92, 0xd8, 0x86, 0x15, 0x59, 0xad, 0xb2,
-	0x2f, 0xbc, 0x2b, 0x42, 0x2f, 0xaf, 0x78, 0x6b, 0x41, 0x7a, 0xd8, 0x39, 0x70, 0x24, 0xed, 0xa8,
-	0x03, 0x15, 0xc6, 0x31, 0x27, 0xad, 0xca, 0x66, 0x69, 0x6b, 0x79, 0xb7, 0x39, 0x15, 0xe9, 0x99,
-	0xc0, 0xdc, 0xcc, 0x45, 0x68, 0x37, 0x1e, 0xb6, 0x9a, 0x69, 0x97, 0x16, 0x19, 0x26, 0x06, 0x74,
-	0x96, 0x0e, 0xae, 0x29, 0x3f, 0x4d, 0x02, 0x92, 0xe8, 0x27, 0xdd, 0x80, 0x32, 0x66, 0x43, 0x95,
-	0xc8, 0xfa, 0xf8, 0x7a, 0x36, 0x3c, 0x9a, 0x73, 0x05, 0x22, 0x1c, 0x06, 0x2a, 0x71, 0x86, 0xc3,
-	0x3e, 0x0d, 0x84, 0xc3, 0x80, 0x06, 0xfb, 0x0f, 0xa0, 0x16, 0x10, 0x8e, 0x69, 0xc8, 0x9c, 0x3f,
-	0x4b, 0xd0, 0x98, 0xe0, 0x50, 0x2f, 0xf6, 0x1d, 0x2c, 0xd1, 0xe8, 0x06, 0x87, 0x34, 0xf0, 0x62,
-	0x01, 0x28, 0xba, 0x71, 0x34, 0xc7, 0x19, 0x28, 0x0f, 0x1d, 0xcd, 0xb9, 0x16, 0x35, 0xbe, 0xd1,
-	0x2e, 0x34, 0xb1, 0xef, 0x93, 0x11, 0x27, 0xea, 0xb4, 0x17, 0xc5, 0x91, 0x4f, 0xb2, 0xa7, 0x3c,
-	0x9a, 0x73, 0x91, 0x46, 0xa5, 0xfb, 0x89, 0xc0, 0x4c, 0x4d, 0x0d, 0x58, 0x11, 0x6d, 0x2e, 0xc1,
-	0x71, 0xef, 0xbf, 0x02, 0x64, 0x1a, 0x95, 0xcc, 0x0d, 0x58, 0xc0, 0x6c, 0xa8, 0xbb, 0xde, 0x4c,
-	0x86, 0x2b, 0x01, 0xe1, 0x30, 0xa0, 0x81, 0xae, 0x6e, 0x33, 0x19, 0xae, 0x04, 0x9c, 0xaf, 0x00,
-	0x1d, 0xe0, 0xc8, 0x27, 0xe1, 0x54, 0x8e, 0xeb, 0xa6, 0x70, 0xd5, 0x72, 0xf1, 0x58, 0xae, 0x98,
-	0x50, 0x13, 0xc7, 0x32, 0x3d, 0xce, 0xfb, 0x79, 0xa8, 0x64, 0x39, 0x70, 0xc0, 0x4a, 0x19, 0x49,
-	0x3c, 0x96, 0x0e, 0x8c, 0xc2, 0x9c, 0xb0, 0x89, 0xbe, 0x4e, 0x30, 0x27, 0xde, 0x05, 0xbd, 0x25,
-	0xd9, 0x7b, 0x95, 0x5d, 0xc3, 0x82, 0x6c, 0x28, 0xe3, 0x6b, 0x2e, 0x6b, 0xb1, 0xec, 0x8a, 0x9f,
-	0xa8, 0x03, 0xf6, 0x45, 0x1a, 0x05, 0x34, 0xba, 0xf4, 0x2e, 0x08, 0xf1, 0x84, 0xaf, 0x2c, 0xc4,
-	0xb2, 0x3b, 0x63, 0x47, 0x9b, 0x93, 0x31, 0x54, 0xa4, 0x00, 0xd3, 0x24, 0xaa, 0x3d, 0x2b, 0xd5,
-	0xaa, 0x1c, 0x74, 0xaa, 0x28, 0x9b, 0x50, 0x49, 0x23, 0xca, 0x59, 0xab, 0x96, 0xf5, 0x80, 0xfc,
-	0x40, 0xcf, 0x61, 0x45, 0xfe, 0xf0, 0xd2, 0xe8, 0x22, 0x0d, 0x2f, 0x68, 0x18, 0x92, 0xa0, 0xb5,
-	0x28, 0x3d, 0x66, 0x01, 0xe7, 0x37, 0x28, 0xef, 0xd3, 0x00, 0x7d, 0x36, 0x7e, 0x54, 0x55, 0x3f,
-	0x4b, 0xe3, 0xde, 0x93, 0x69, 0xd3, 0x28, 0xfa, 0x02, 0x1a, 0xd7, 0x34, 0xf2, 0x82, 0x54, 0xf5,
-	0xd8, 0x20, 0x8c, 0xfd, 0x21, 0x53, 0x29, 0x29, 0x82, 0xc4, 0x98, 0xbe, 0x21, 0x09, 0xa3, 0x71,
-	0xa4, 0x7a, 0x55, 0x7f, 0x0a, 0xee, 0x3d, 0x36, 0xfc, 0x38, 0x6e, 0x7c, 0x7b, 0x2f, 0xf7, 0x2c,
-	0x74, 0x3f, 0x77, 0x67, 0x08, 0x96, 0xd9, 0xe7, 0xc8, 0x06, 0xab, 0xdf, 0x3b, 0x39, 0x3c, 0x3e,
-	0xf9, 0xde, 0x3b, 0xed, 0xf7, 0x4e, 0xec, 0x39, 0x84, 0x60, 0x59, 0x5b, 0x7e, 0xec, 0x1f, 0xee,
-	0x9d, 0xf7, 0xec, 0x12, 0x5a, 0x84, 0x05, 0x89, 0xce, 0xa3, 0x3a, 0xd4, 0x7a, 0x3f, 0xf5, 0x8f,
-	0xdd, 0xde, 0xa1, 0x5d, 0x36, 0x5d, 0x0f, 0x5e, 0x9e, 0x9e, 0xf5, 0x0e, 0xed, 0x05, 0x04, 0x50,
-	0x55, 0xbf, 0x2b, 0xbb, 0xff, 0x54, 0xa0, 0x7a, 0x2e, 0x07, 0x1d, 0x7a, 0x0d, 0x75, 0x63, 0x25,
-	0xa3, 0x76, 0xde, 0xa6, 0xd3, 0x7b, 0xba, 0x3d, 0x3d, 0x7a, 0x9d, 0xd5, 0xdf, 0xff, 0xfe, 0xf0,
-	0xd7, 0xfc, 0x23, 0xc7, 0xee, 0xde, 0xbc, 0xe8, 0xfa, 0xe1, 0x75, 0x57, 0xaf, 0xca, 0x6f, 0x4b,
-	0x1d, 0xe4, 0x83, 0x65, 0xae, 0x5c, 0xb4, 0xaa, 0x4f, 0x17, 0xec, 0xe7, 0xf6, 0x5a, 0x31, 0xa8,
-	0x7a, 0xa3, 0x25, 0x79, 0x10, 0x9a, 0xe1, 0x41, 0x23, 0xb0, 0xcc, 0xbd, 0x97, 0x93, 0x14, 0xac,
-	0xdb, 0x9c, 0xa4, 0x68, 0x55, 0x3a, 0xcf, 0x24, 0xc9, 0x46, 0xe7, 0xe9, 0x34, 0x49, 0xf7, 0x6d,
-	0xbe, 0x25, 0xde, 0xa1, 0xf7, 0x25, 0x78, 0x38, 0xb5, 0xac, 0xd0, 0xba, 0xbe, 0xb8, 0x78, 0x95,
-	0xb6, 0x37, 0xee, 0xc5, 0x15, 0xf7, 0x0b, 0xc9, 0xbd, 0xed, 0x7c, 0x3a, 0xc3, 0xad, 0x97, 0xd7,
-	0x84, 0x08, 0x91, 0x5e, 0x0c, 0x75, 0x63, 0xfa, 0xe6, 0xef, 0x36, 0x3b, 0xf6, 0xdb, 0xab, 0x85,
-	0x98, 0xa2, 0x7e, 0x22, 0xa9, 0x1b, 0xce, 0xb2, 0xa6, 0x96, 0x6d, 0x2e, 0x5f, 0xf0, 0x67, 0x80,
-	0x7c, 0x70, 0xa2, 0x27, 0xe6, 0x13, 0x4d, 0x4c, 0xd8, 0x76, 0xbb, 0x08, 0x52, 0xf7, 0x3f, 0x96,
-	0xf7, 0xdb, 0x68, 0xea, 0x7e, 0x14, 0x42, 0xdd, 0x18, 0x83, 0xb9, 0xfe, 0xd9, 0x91, 0x9a, 0xeb,
-	0x2f, 0x9a, 0x9b, 0x9f, 0xc8, 0xfb, 0xd7, 0x3b, 0x6b, 0x93, 0xf7, 0x77, 0xdf, 0x1a, 0xe3, 0xea,
-	0xdd, 0xa0, 0x2a, 0xff, 0x7f, 0x7e, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0xe2, 0xbf,
-	0xbe, 0xc7, 0x0a, 0x00, 0x00,
+	// 1110 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xdb, 0x36,
+	0x14, 0x8e, 0xe2, 0xbf, 0xe4, 0xf8, 0xa7, 0x2a, 0xed, 0x76, 0xae, 0xdb, 0x34, 0x81, 0xb6, 0x6e,
+	0x5e, 0x32, 0xc4, 0x68, 0x86, 0x02, 0xc3, 0x76, 0x95, 0x1f, 0x77, 0x09, 0x56, 0x24, 0x86, 0x92,
+	0xa6, 0x03, 0x06, 0x4c, 0xa3, 0x25, 0x26, 0x21, 0x2c, 0x4b, 0x9e, 0x48, 0xa5, 0x0e, 0x8a, 0xde,
+	0x0c, 0xe8, 0x03, 0x0c, 0x7b, 0xb4, 0xbd, 0x42, 0xaf, 0xf7, 0x02, 0xbb, 0x19, 0x48, 0x91, 0x96,
+	0xac, 0xb8, 0xe8, 0x76, 0xb1, 0x3b, 0xeb, 0x7c, 0x87, 0xe7, 0xfb, 0x78, 0x78, 0x7e, 0x0c, 0x35,
+	0x1e, 0x61, 0x8f, 0x44, 0xdb, 0x93, 0x28, 0xe4, 0x21, 0x2a, 0xbb, 0xfe, 0x38, 0x9a, 0xb8, 0x9d,
+	0x47, 0x97, 0x61, 0x78, 0xe9, 0x93, 0x1e, 0x9e, 0xd0, 0x1e, 0x0e, 0x82, 0x90, 0x63, 0x4e, 0xc3,
+	0x80, 0x25, 0x5e, 0x1d, 0x13, 0xc7, 0xae, 0xf8, 0x26, 0xfa, 0x9c, 0xf5, 0x0b, 0xa0, 0xa3, 0x80,
+	0xf2, 0x5d, 0xd7, 0x0d, 0xe3, 0x80, 0xdb, 0xe4, 0xd7, 0x98, 0x30, 0x8e, 0x3e, 0x85, 0x3a, 0x4e,
+	0x2c, 0xce, 0x35, 0xf6, 0x63, 0xd2, 0x36, 0x36, 0x8c, 0x6e, 0xd1, 0xae, 0x29, 0xe3, 0xb9, 0xb0,
+	0xa1, 0x27, 0xd0, 0xd0, 0x4e, 0x64, 0x3a, 0xa1, 0xd1, 0x4d, 0x7b, 0x79, 0xc3, 0xe8, 0xd6, 0x6d,
+	0x7d, 0xb4, 0x2f, 0x8d, 0xd6, 0x3d, 0x68, 0xbe, 0xa0, 0x4c, 0x33, 0x30, 0x45, 0x61, 0xed, 0x43,
+	0x6b, 0xde, 0xcc, 0x26, 0x61, 0xc0, 0x08, 0xda, 0x82, 0x15, 0x75, 0x9e, 0xb5, 0x8d, 0x8d, 0x42,
+	0xb7, 0xba, 0x73, 0x67, 0x3b, 0xb9, 0xdb, 0xb6, 0x16, 0x39, 0x73, 0xb0, 0xbe, 0x81, 0xf2, 0x49,
+	0xcc, 0x27, 0x31, 0x47, 0x2d, 0x28, 0x65, 0x95, 0x26, 0x1f, 0xa8, 0x0d, 0x15, 0xec, 0x79, 0x11,
+	0x61, 0x4c, 0x6a, 0x5b, 0xb5, 0xf5, 0xa7, 0xf5, 0x33, 0x34, 0xf7, 0xfd, 0x90, 0x91, 0xdc, 0xc5,
+	0xd7, 0x00, 0x92, 0xb4, 0x3a, 0x23, 0x72, 0x23, 0x63, 0xd5, 0xec, 0xd5, 0xc4, 0xf2, 0x03, 0xb9,
+	0x41, 0x5d, 0xa8, 0x84, 0x92, 0x4f, 0xc4, 0x13, 0xda, 0x1a, 0x5a, 0x5b, 0x22, 0xc3, 0xd6, 0xb0,
+	0xf5, 0x0c, 0x5a, 0xf3, 0xf1, 0xd5, 0xf5, 0xd6, 0x00, 0x5c, 0x61, 0x77, 0xf8, 0x94, 0x7a, 0x9a,
+	0x40, 0x5a, 0xce, 0xa6, 0xd4, 0xb3, 0xde, 0x19, 0x70, 0xff, 0x15, 0xe5, 0x57, 0x5e, 0x84, 0x5f,
+	0xff, 0x4f, 0xd2, 0x90, 0x05, 0x75, 0x86, 0xb9, 0x33, 0x21, 0x91, 0x73, 0x3d, 0xbc, 0xe1, 0xa4,
+	0x5d, 0x90, 0x29, 0xab, 0x32, 0xcc, 0x07, 0x24, 0x3a, 0x17, 0x26, 0x8b, 0xc2, 0x27, 0xb7, 0x64,
+	0xa8, 0x1b, 0x7c, 0x09, 0x15, 0x95, 0x7f, 0x29, 0x62, 0xc1, 0xfb, 0x68, 0x5c, 0x94, 0xd1, 0x6b,
+	0x15, 0x25, 0xb9, 0xef, 0xb2, 0x54, 0x5d, 0xd3, 0x46, 0x79, 0xe5, 0xf7, 0x06, 0x54, 0xd4, 0xc9,
+	0x8f, 0xdd, 0xf1, 0x2b, 0x58, 0x11, 0x97, 0x08, 0x69, 0xc0, 0x65, 0xa8, 0xea, 0x8e, 0x99, 0xb9,
+	0xe4, 0x40, 0xd8, 0xed, 0x99, 0x47, 0x5a, 0x12, 0x85, 0x6c, 0x49, 0x6c, 0xc1, 0x5d, 0x59, 0xad,
+	0xb2, 0x2f, 0x9c, 0x2b, 0x42, 0x2f, 0xaf, 0x78, 0xbb, 0x28, 0x0b, 0xd7, 0x4c, 0x81, 0x43, 0x69,
+	0x47, 0x9b, 0x50, 0x62, 0x1c, 0x73, 0xd2, 0x2e, 0x6d, 0x18, 0xdd, 0xc6, 0x4e, 0x2b, 0x77, 0xd3,
+	0x53, 0x81, 0xd9, 0x89, 0x4b, 0xee, 0x65, 0xcb, 0xf9, 0x97, 0xc5, 0x80, 0x4e, 0xe3, 0xe1, 0x98,
+	0xf2, 0x93, 0xc8, 0x23, 0x91, 0x7e, 0xd4, 0x75, 0x28, 0x60, 0x36, 0x52, 0x89, 0xac, 0xce, 0xc2,
+	0xb3, 0xd1, 0xe1, 0x92, 0x2d, 0x10, 0xe1, 0x30, 0x54, 0x89, 0xcb, 0x38, 0xec, 0x51, 0x4f, 0x38,
+	0x0c, 0xa9, 0xb7, 0xb7, 0x0a, 0x15, 0x8f, 0x70, 0x4c, 0x7d, 0x66, 0xfd, 0x6e, 0x40, 0x73, 0x8e,
+	0x43, 0xbd, 0xd8, 0x77, 0x50, 0xa7, 0xc1, 0x35, 0xf6, 0xa9, 0xe7, 0x84, 0x02, 0x50, 0x74, 0xb3,
+	0xdb, 0x1c, 0x25, 0xa0, 0x3c, 0x74, 0xb8, 0x64, 0xd7, 0x68, 0xe6, 0x1b, 0xed, 0x40, 0x0b, 0xbb,
+	0x2e, 0x99, 0x70, 0xa2, 0x4e, 0x3b, 0x41, 0x18, 0xb8, 0x24, 0x79, 0xca, 0xc3, 0x25, 0x1b, 0x69,
+	0x54, 0xba, 0x1f, 0x0b, 0x2c, 0xab, 0xa9, 0x09, 0x77, 0x45, 0x9b, 0x4b, 0x70, 0xd6, 0xfb, 0xe7,
+	0x80, 0xb2, 0x46, 0x25, 0x73, 0x1d, 0x8a, 0x98, 0x8d, 0x74, 0xd7, 0x67, 0x93, 0x61, 0x4b, 0x40,
+	0x38, 0x0c, 0xa9, 0xa7, 0xeb, 0x3b, 0x9b, 0x0c, 0x5b, 0x02, 0xd6, 0x33, 0x40, 0xfb, 0x38, 0x70,
+	0x89, 0x9f, 0xcb, 0x71, 0x35, 0x2b, 0x3c, 0xa9, 0x2a, 0x08, 0x67, 0x72, 0xc5, 0x84, 0x9a, 0x3b,
+	0x96, 0xe8, 0xb1, 0xfe, 0x36, 0xa0, 0x94, 0xe4, 0xe0, 0x23, 0x65, 0xb9, 0x06, 0x10, 0x61, 0x4e,
+	0x9c, 0x0b, 0x3a, 0x25, 0x9e, 0x1a, 0x82, 0xab, 0xc2, 0xf2, 0x5c, 0x18, 0x90, 0x09, 0x05, 0x3c,
+	0xe6, 0xaa, 0x0a, 0xc5, 0x4f, 0xd4, 0x05, 0xf3, 0x22, 0x0e, 0x3c, 0x1a, 0x5c, 0x3a, 0x17, 0x84,
+	0x38, 0xc2, 0x55, 0x96, 0x60, 0xd1, 0x6e, 0x28, 0xfb, 0x73, 0x42, 0x6c, 0x51, 0x54, 0x39, 0xed,
+	0xa5, 0xbc, 0x76, 0x51, 0xe4, 0x49, 0x85, 0x96, 0xe5, 0x7c, 0x53, 0xb5, 0xd8, 0x82, 0x52, 0x1c,
+	0x50, 0xce, 0xda, 0x15, 0x29, 0x26, 0xf9, 0x10, 0xa5, 0x2f, 0x7f, 0x38, 0x71, 0x70, 0x11, 0xfb,
+	0x17, 0xd4, 0xf7, 0x89, 0xd7, 0x5e, 0x49, 0x4a, 0x5f, 0x02, 0x2f, 0x53, 0xbb, 0x35, 0x85, 0xc2,
+	0x1e, 0xf5, 0xd0, 0x17, 0xb3, 0xa7, 0x54, 0x55, 0x53, 0x9f, 0x75, 0x9c, 0x4c, 0x96, 0x46, 0xd1,
+	0x36, 0x34, 0xc7, 0x34, 0x70, 0xbc, 0x58, 0x75, 0xd6, 0xd0, 0x0f, 0xdd, 0x11, 0x53, 0xd9, 0xb8,
+	0x3b, 0xa6, 0xc1, 0x81, 0x42, 0xf6, 0x24, 0x20, 0x46, 0xf3, 0x35, 0x89, 0x18, 0x0d, 0x03, 0x99,
+	0x99, 0xba, 0xad, 0x3f, 0x05, 0xf3, 0x2e, 0x1b, 0xfd, 0x37, 0x66, 0x3c, 0xfd, 0x20, 0x33, 0x9e,
+	0xfe, 0x5b, 0xe6, 0xcd, 0x11, 0xd4, 0xb2, 0x9d, 0x8d, 0x4c, 0xa8, 0x0d, 0xfa, 0xc7, 0x07, 0x47,
+	0xc7, 0xdf, 0x3b, 0x27, 0x83, 0xfe, 0xb1, 0xb9, 0x84, 0x10, 0x34, 0xb4, 0xe5, 0xe5, 0xe0, 0x60,
+	0xf7, 0xac, 0x6f, 0x1a, 0x68, 0x05, 0x8a, 0x12, 0x5d, 0x46, 0x55, 0xa8, 0xf4, 0x7f, 0x1c, 0x1c,
+	0xd9, 0xfd, 0x03, 0xb3, 0x90, 0x75, 0xdd, 0x7f, 0x71, 0x72, 0xda, 0x3f, 0x30, 0x8b, 0x08, 0xa0,
+	0xac, 0x7e, 0x97, 0x76, 0xfe, 0x2a, 0x41, 0xf9, 0x4c, 0xd6, 0x10, 0x7a, 0x05, 0xd5, 0xcc, 0x12,
+	0x46, 0x9d, 0xb4, 0x31, 0xf3, 0x9b, 0xb9, 0x93, 0x1f, 0xb6, 0xd6, 0xc3, 0xdf, 0xfe, 0x7c, 0xff,
+	0xc7, 0xf2, 0x3d, 0xcb, 0xec, 0x5d, 0x3f, 0xed, 0xb9, 0xfe, 0xb8, 0xa7, 0x97, 0xe3, 0xb7, 0xc6,
+	0x26, 0x72, 0xa1, 0x96, 0x5d, 0xb2, 0xe8, 0xa1, 0x3e, 0xbd, 0x60, 0x23, 0x77, 0x1e, 0x2d, 0x06,
+	0x55, 0x37, 0xb4, 0x25, 0x0f, 0x42, 0xb7, 0x78, 0xd0, 0x04, 0x6a, 0xd9, 0x55, 0x97, 0x92, 0x2c,
+	0x58, 0xb0, 0x29, 0xc9, 0xa2, 0xed, 0x68, 0x3d, 0x91, 0x24, 0xeb, 0x9b, 0x6b, 0x79, 0x92, 0xde,
+	0x9b, 0xb4, 0x01, 0xdf, 0xa2, 0x77, 0x06, 0xdc, 0xc9, 0xad, 0x27, 0xf4, 0x58, 0x07, 0x5e, 0xbc,
+	0x3e, 0x3b, 0xeb, 0x1f, 0xc4, 0x15, 0xf7, 0x53, 0xc9, 0xbd, 0x65, 0x7d, 0x7e, 0x8b, 0x5b, 0xaf,
+	0xab, 0x39, 0x11, 0x22, 0xbd, 0x18, 0xaa, 0x99, 0x79, 0x9b, 0xbe, 0xdb, 0xed, 0x41, 0xdf, 0x79,
+	0xb8, 0x10, 0x53, 0xd4, 0x0f, 0x24, 0x75, 0xd3, 0x6a, 0x68, 0x6a, 0xd9, 0xe0, 0xf2, 0x05, 0x7f,
+	0x02, 0x48, 0x47, 0x25, 0x7a, 0x90, 0x7d, 0xa2, 0xb9, 0x99, 0xda, 0xe9, 0x2c, 0x82, 0x54, 0xfc,
+	0xfb, 0x32, 0xbe, 0x89, 0x72, 0xf1, 0x91, 0x0f, 0xd5, 0xcc, 0xe0, 0x4b, 0xf5, 0xdf, 0x1e, 0xa2,
+	0xa9, 0xfe, 0x45, 0x93, 0xf2, 0x33, 0x19, 0xff, 0xf1, 0xe6, 0xa3, 0xf9, 0xf8, 0xbd, 0x37, 0x99,
+	0xd9, 0xf5, 0x76, 0x58, 0x96, 0xff, 0x38, 0xbf, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x19, 0xc3,
+	0x98, 0x01, 0xb9, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/clmrpc/trader.proto b/clmrpc/trader.proto
index 8994dc7..3ce9bc1 100644
--- a/clmrpc/trader.proto
+++ b/clmrpc/trader.proto
@@ -53,7 +53,7 @@ service Trader {
 }
 
 message InitAccountRequest {
-    uint32 account_value = 1;
+    uint64 account_value = 1;
     uint32 account_expiry = 2;
 }
 
@@ -65,7 +65,7 @@ message ListAccountsResponse {
 
 message Output {
     // The value, in satoshis, of the output.
-    uint32 value = 1;
+    uint64 value = 1;
 
     // The address corresponding to the output.
     string address = 2;
@@ -73,18 +73,18 @@ message Output {
 
 message CloseAccountRequest {
     // The trader key associated with the account that will be closed.
-    bytes trader_key = 1 [json_name = "trader_key"];
+    bytes trader_key = 1;
 
     /*
     The outputs that should be created as a result of closing the account. If
     none are specified, then the funds within the account are sent to an address
     the backing lnd node controls.
     */
-    repeated Output outputs = 2 [json_name = "outputs"];
+    repeated Output outputs = 2;
 }
 message CloseAccountResponse {
     // The hash of the closing transaction.
-    bytes close_txid = 1 [json_name = "close_txid"];
+    bytes close_txid = 1;
 }
 
 message WithdrawAccountRequest {
@@ -100,7 +100,7 @@ message WithdrawAccountRequest {
     /*
     The fee rate, in satoshis per vbyte, to use for the withdrawal transaction.
     */
-    uint32 sat_per_byte = 3;
+    uint64 sat_per_vbyte = 3;
 }
 message WithdrawAccountResponse {
     // The state of the account after processing the withdrawal.
@@ -154,7 +154,7 @@ message Account {
     OutPoint outpoint = 2;
 
     // The current value in satoshis of the account.
-    uint32 value = 3;
+    uint64 value = 3;
 
     // The height at which the account will expire.
     uint32 expiration_height = 4;
@@ -174,12 +174,12 @@ message SubmitOrderRequest {
 }
 message SubmitOrderResponse {
     oneof details {
-        /**
+        /*
         Order failed with the given reason.
         */
         InvalidOrder invalid_order = 1;
 
-        /**
+        /*
         The order nonce of the accepted order.
         */
         bytes accepted_order_nonce = 2;
@@ -200,84 +200,84 @@ message CancelOrderResponse {
 }
 
 message Order {
-    /**
-    The user's sub key of the account that is used for the order.
+    /*
+    The trader's account key of the account that is used for the order.
     */
-    bytes user_sub_key = 1 [json_name = "user_sub_key"];
+    bytes trader_key = 1;
 
-    /**
+    /*
     Fixed order rate in parts per million.
     */
-    int64 rate_fixed = 2 [json_name = "rate_fixed"];
+    uint32 rate_fixed = 2;
 
-    /**
+    /*
     Order amount in satoshis.
     */
-    int64 amt = 3 [json_name = "amt"];
+    uint64 amt = 3;
 
-    /**
+    /*
     Preferred fee rate to be used for the channel funding transaction, expressed
     in satoshis per 1000 weight units (sat/kW).
     */
-    int64 funding_fee_rate = 4 [json_name = "funding_fee_rate"];
+    uint64 funding_fee_rate = 4;
 
-    /**
+    /*
     Order nonce, acts as unique order identifier.
     */
-    bytes order_nonce = 5 [json_name = "order_nonce"];
+    bytes order_nonce = 5;
 
-    /**
+    /*
     The state the order currently is in.
     */
-    string state = 6 [json_name = "state"];
+    string state = 6;
 
-    /**
+    /*
     The number of order units the amount corresponds to.
     */
-    uint32 units = 7 [json_name = "units"];
+    uint32 units = 7;
 
-    /**
+    /*
     The number of currently unfilled units of this order. This will be equal to
     the total amount of units until the order has reached the state PARTIAL_FILL
     or EXECUTED.
     */
-    uint32 units_unfulfilled = 8 [json_name = "units_unfulfilled"];
+    uint32 units_unfulfilled = 8;
 }
 
 message Bid {
-    /**
+    /*
     The common fields shared between both ask and bid order types.
     */
-    Order details = 1 [json_name = "details"];
+    Order details = 1;
 
-    /**
+    /*
     Required minimum number of blocks that a channel opened as a result of this
     bid should be kept open.
     */
-    int64 min_duration_blocks = 2 [json_name = "min_duration_blocks"];
+    uint32 min_duration_blocks = 2;
 
-    /**
+    /*
     The version of the order format that is used. Will be increased once new
     features are added.
     */
-    uint32 version = 3 [json_name = "version"];
+    uint32 version = 3;
 }
 
 message Ask {
-    /**
+    /*
     The common fields shared between both ask and bid order types.
     */
-    Order details = 1 [json_name = "details"];
+    Order details = 1;
 
-    /**
+    /*
     The maximum number of blocks the liquidity provider is willing to provide
     the channel funds for.
     */
-    int64 max_duration_blocks = 2 [json_name = "max_duration_blocks"];
+    uint32 max_duration_blocks = 2;
 
-    /**
+    /*
     The version of the order format that is used. Will be increased once new
     features are added.
     */
-    uint32 version = 3 [json_name = "version"];
+    uint32 version = 3;
 }
diff --git a/clmrpc/trader.swagger.json b/clmrpc/trader.swagger.json
index d02a052..be24c5a 100644
--- a/clmrpc/trader.swagger.json
+++ b/clmrpc/trader.swagger.json
@@ -202,8 +202,8 @@
           "description": "The current outpoint associated with the account. This will change every\ntime the account has been updated."
         },
         "value": {
-          "type": "integer",
-          "format": "int64",
+          "type": "string",
+          "format": "uint64",
           "description": "The current value in satoshis of the account."
         },
         "expiration_height": {
@@ -240,17 +240,17 @@
       "properties": {
         "details": {
           "$ref": "#/definitions/clmrpcOrder",
-          "description": "*\nThe common fields shared between both ask and bid order types."
+          "description": "The common fields shared between both ask and bid order types."
         },
         "max_duration_blocks": {
-          "type": "string",
+          "type": "integer",
           "format": "int64",
-          "description": "*\nThe maximum number of blocks the liquidity provider is willing to provide\nthe channel funds for."
+          "description": "The maximum number of blocks the liquidity provider is willing to provide\nthe channel funds for."
         },
         "version": {
           "type": "integer",
           "format": "int64",
-          "description": "*\nThe version of the order format that is used. Will be increased once new\nfeatures are added."
+          "description": "The version of the order format that is used. Will be increased once new\nfeatures are added."
         }
       }
     },
@@ -259,17 +259,17 @@
       "properties": {
         "details": {
           "$ref": "#/definitions/clmrpcOrder",
-          "description": "*\nThe common fields shared between both ask and bid order types."
+          "description": "The common fields shared between both ask and bid order types."
         },
         "min_duration_blocks": {
-          "type": "string",
+          "type": "integer",
           "format": "int64",
-          "description": "*\nRequired minimum number of blocks that a channel opened as a result of this\nbid should be kept open."
+          "description": "Required minimum number of blocks that a channel opened as a result of this\nbid should be kept open."
         },
         "version": {
           "type": "integer",
           "format": "int64",
-          "description": "*\nThe version of the order format that is used. Will be increased once new\nfeatures are added."
+          "description": "The version of the order format that is used. Will be increased once new\nfeatures are added."
         }
       }
     },
@@ -290,8 +290,8 @@
       "type": "object",
       "properties": {
         "account_value": {
-          "type": "integer",
-          "format": "int64"
+          "type": "string",
+          "format": "uint64"
         },
         "account_expiry": {
           "type": "integer",
@@ -345,44 +345,44 @@
     "clmrpcOrder": {
       "type": "object",
       "properties": {
-        "user_sub_key": {
+        "trader_key": {
           "type": "string",
           "format": "byte",
-          "description": "*\nThe user's sub key of the account that is used for the order."
+          "description": "The trader's account key of the account that is used for the order."
         },
         "rate_fixed": {
-          "type": "string",
+          "type": "integer",
           "format": "int64",
-          "description": "*\nFixed order rate in parts per million."
+          "description": "Fixed order rate in parts per million."
         },
         "amt": {
           "type": "string",
-          "format": "int64",
-          "description": "*\nOrder amount in satoshis."
+          "format": "uint64",
+          "description": "Order amount in satoshis."
         },
         "funding_fee_rate": {
           "type": "string",
-          "format": "int64",
-          "description": "*\nPreferred fee rate to be used for the channel funding transaction, expressed\nin satoshis per 1000 weight units (sat/kW)."
+          "format": "uint64",
+          "description": "Preferred fee rate to be used for the channel funding transaction, expressed\nin satoshis per 1000 weight units (sat/kW)."
         },
         "order_nonce": {
           "type": "string",
           "format": "byte",
-          "description": "*\nOrder nonce, acts as unique order identifier."
+          "description": "Order nonce, acts as unique order identifier."
         },
         "state": {
           "type": "string",
-          "description": "*\nThe state the order currently is in."
+          "description": "The state the order currently is in."
         },
         "units": {
           "type": "integer",
           "format": "int64",
-          "description": "*\nThe number of order units the amount corresponds to."
+          "description": "The number of order units the amount corresponds to."
         },
         "units_unfulfilled": {
           "type": "integer",
           "format": "int64",
-          "description": "*\nThe number of currently unfilled units of this order. This will be equal to\nthe total amount of units until the order has reached the state PARTIAL_FILL\nor EXECUTED."
+          "description": "The number of currently unfilled units of this order. This will be equal to\nthe total amount of units until the order has reached the state PARTIAL_FILL\nor EXECUTED."
         }
       }
     },
@@ -392,12 +392,12 @@
         "txid": {
           "type": "string",
           "format": "byte",
-          "description": "*\nRaw bytes representing the transaction id."
+          "description": "Raw bytes representing the transaction id."
         },
         "output_index": {
           "type": "integer",
           "format": "int64",
-          "description": "*\nThe index of the output on the transaction."
+          "description": "The index of the output on the transaction."
         }
       }
     },
@@ -405,8 +405,8 @@
       "type": "object",
       "properties": {
         "value": {
-          "type": "integer",
-          "format": "int64",
+          "type": "string",
+          "format": "uint64",
           "description": "The value, in satoshis, of the output."
         },
         "address": {
@@ -431,12 +431,12 @@
       "properties": {
         "invalid_order": {
           "$ref": "#/definitions/clmrpcInvalidOrder",
-          "description": "*\nOrder failed with the given reason."
+          "description": "Order failed with the given reason."
         },
         "accepted_order_nonce": {
           "type": "string",
           "format": "byte",
-          "description": "*\nThe order nonce of the accepted order."
+          "description": "The order nonce of the accepted order."
         }
       }
     },
@@ -455,9 +455,9 @@
           },
           "description": "The outputs we'll withdraw funds from the account into."
         },
-        "sat_per_byte": {
-          "type": "integer",
-          "format": "int64",
+        "sat_per_vbyte": {
+          "type": "string",
+          "format": "uint64",
           "description": "The fee rate, in satoshis per vbyte, to use for the withdrawal transaction."
         }
       }
diff --git a/cmd/agora/account.go b/cmd/agora/account.go
index 8139301..58c97ba 100644
--- a/cmd/agora/account.go
+++ b/cmd/agora/account.go
@@ -28,7 +28,7 @@ var accountsCommands = []cli.Command{
 type Account struct {
 	TraderKey        string `json:"trader_key"`
 	OutPoint         string `json:"outpoint"`
-	Value            uint32 `json:"value"`
+	Value            uint64 `json:"value"`
 	ExpirationHeight uint32 `json:"expiration_height"`
 	State            string `json:"state"`
 	CloseTxid        string `json:"close_txid"`
@@ -92,7 +92,7 @@ func newAccount(ctx *cli.Context) error {
 
 	resp, err := client.InitAccount(context.Background(),
 		&clmrpc.InitAccountRequest{
-			AccountValue:  uint32(amt),
+			AccountValue:  amt,
 			AccountExpiry: uint32(expiry),
 		},
 	)
@@ -149,7 +149,7 @@ var withdrawAccountCommand = cli.Command{
 	Description: `
 	Withdraw funds from an existing account to a supported address.
 	`,
-	ArgsUsage: "addr sat_per_byte",
+	ArgsUsage: "addr sat_per_vbyte",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name: "trader_key",
@@ -166,8 +166,8 @@ var withdrawAccountCommand = cli.Command{
 				"and withdrawn from the account",
 		},
 		cli.Uint64Flag{
-			Name: "sat_per_byte",
-			Usage: "the fee rate expressed in sat/byte that " +
+			Name: "sat_per_vbyte",
+			Usage: "the fee rate expressed in sat/vbyte that " +
 				"should be used for the withdrawal",
 		},
 	},
@@ -188,7 +188,7 @@ func withdrawAccount(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	satPerByte, err := parseUint64(ctx, 3, "sat_per_byte", cmd)
+	satPerVByte, err := parseUint64(ctx, 3, "sat_per_vbyte", cmd)
 	if err != nil {
 		return err
 	}
@@ -204,11 +204,11 @@ func withdrawAccount(ctx *cli.Context) error {
 			TraderKey: traderKey,
 			Outputs: []*clmrpc.Output{
 				{
-					Value:   uint32(amt),
+					Value:   amt,
 					Address: addr,
 				},
 			},
-			SatPerByte: uint32(satPerByte),
+			SatPerVbyte: satPerVByte,
 		},
 	)
 	if err != nil {
diff --git a/cmd/agora/order.go b/cmd/agora/order.go
index 80fee19..fe0837a 100644
--- a/cmd/agora/order.go
+++ b/cmd/agora/order.go
@@ -65,23 +65,23 @@ func parseCommonParams(ctx *cli.Context) (*clmrpc.Order, error) {
 
 	switch {
 	case ctx.IsSet("amt"):
-		params.Amt = int64(ctx.Uint64("amt"))
+		params.Amt = ctx.Uint64("amt")
 	case args.Present():
 		amt, err = parseAmt(args.First())
-		params.Amt = int64(amt)
+		params.Amt = uint64(amt)
 		args = args.Tail()
 	}
 	if err != nil {
 		return nil, fmt.Errorf("unable to decode amount: %v", err)
 	}
 
-	params.UserSubKey, err = parseAccountKey(ctx, args)
+	params.TraderKey, err = parseAccountKey(ctx, args)
 	if err != nil {
 		return nil, fmt.Errorf("unable to parse acct_key: %v", err)
 	}
 
-	params.FundingFeeRate = int64(ctx.Uint64("funding_fee_rate"))
-	params.RateFixed = int64(ctx.Uint64("rate_fixed"))
+	params.FundingFeeRate = ctx.Uint64("funding_fee_rate")
+	params.RateFixed = uint32(ctx.Uint64("rate_fixed"))
 
 	return params, nil
 }
@@ -156,7 +156,7 @@ func ordersSubmitAsk(ctx *cli.Context) error { // nolint: dupl
 	}
 	ask := &clmrpc.Ask{
 		Details:           params,
-		MaxDurationBlocks: int64(ctx.Uint64("max_duration_blocks")),
+		MaxDurationBlocks: uint32(ctx.Uint64("max_duration_blocks")),
 		Version:           uint32(order.VersionDefault),
 	}
 
@@ -230,7 +230,7 @@ func ordersSubmitBid(ctx *cli.Context) error { // nolint: dupl
 	}
 	bid := &clmrpc.Bid{
 		Details:           params,
-		MinDurationBlocks: int64(ctx.Uint64("min_duration_blocks")),
+		MinDurationBlocks: uint32(ctx.Uint64("min_duration_blocks")),
 		Version:           uint32(order.VersionDefault),
 	}
 
diff --git a/order/rpc_parse.go b/order/rpc_parse.go
index 57b987e..5d7ec03 100644
--- a/order/rpc_parse.go
+++ b/order/rpc_parse.go
@@ -33,9 +33,9 @@ func ParseRPCOrder(version uint32, details *clmrpc.Order) (*Kit, error) {
 		kit = NewKitWithPreimage(preimage)
 	}
 
-	copy(kit.AcctKey[:], details.UserSubKey)
+	copy(kit.AcctKey[:], details.TraderKey)
 	kit.Version = Version(version)
-	kit.FixedRate = uint32(details.RateFixed)
+	kit.FixedRate = details.RateFixed
 	kit.Amt = btcutil.Amount(details.Amt)
 	kit.FundingFeeRate = chainfee.SatPerKWeight(details.FundingFeeRate)
 	kit.Units = NewSupplyFromSats(kit.Amt)
@@ -58,7 +58,7 @@ func ParseRPCServerOrder(version uint32, details *clmrpc.ServerOrder) (*Kit,
 	copy(nonce[:], details.OrderNonce)
 	kit := NewKit(nonce)
 	kit.Version = Version(version)
-	kit.FixedRate = uint32(details.RateFixed)
+	kit.FixedRate = details.RateFixed
 	kit.Amt = btcutil.Amount(details.Amt)
 	kit.Units = NewSupplyFromSats(kit.Amt)
 	kit.UnitsUnfulfilled = kit.Units
@@ -78,7 +78,7 @@ func ParseRPCServerOrder(version uint32, details *clmrpc.ServerOrder) (*Kit,
 		kit = NewKitWithPreimage(preimage)
 	}
 
-	copy(kit.AcctKey[:], details.UserSubKey)
+	copy(kit.AcctKey[:], details.TraderKey)
 
 	nodePubKey, err := btcec.ParsePubKey(details.NodePub, btcec.S256())
 	if err != nil {
@@ -126,7 +126,7 @@ func ParseRPCServerAsk(details *clmrpc.ServerAsk) (*MatchedOrder, error) {
 	}
 	o.Order = &Ask{
 		Kit:         *kit,
-		MaxDuration: uint32(details.MaxDurationBlocks),
+		MaxDuration: details.MaxDurationBlocks,
 	}
 	return o, nil
 }
@@ -146,7 +146,7 @@ func ParseRPCServerBid(details *clmrpc.ServerBid) (*MatchedOrder, error) {
 	}
 	o.Order = &Bid{
 		Kit:         *kit,
-		MinDuration: uint32(details.MinDurationBlocks),
+		MinDuration: details.MinDurationBlocks,
 	}
 	return o, nil
 }
@@ -182,7 +182,7 @@ func ParseRPCBatch(prepareMsg *clmrpc.OrderMatchPrepare) (*Batch,
 	// Parse account diff.
 	for _, diff := range prepareMsg.ChargedAccounts {
 		var acctKeyRaw [33]byte
-		acctKey, err := btcec.ParsePubKey(diff.UserSubKey, btcec.S256())
+		acctKey, err := btcec.ParsePubKey(diff.TraderKey, btcec.S256())
 		if err != nil {
 			return nil, fmt.Errorf("error parsing account key: %v",
 				err)
diff --git a/rpcserver.go b/rpcserver.go
index 8b263c7..055464b 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -728,7 +728,7 @@ func marshallAccount(a *account.Account) (*clmrpc.Account, error) {
 			Txid:        a.OutPoint.Hash[:],
 			OutputIndex: a.OutPoint.Index,
 		},
-		Value:            uint32(a.Value),
+		Value:            uint64(a.Value),
 		ExpirationHeight: a.Expiry,
 		State:            rpcState,
 		CloseTxid:        closeTxHash[:],
@@ -757,7 +757,7 @@ func (s *rpcServer) WithdrawAccount(ctx context.Context,
 	}
 
 	// Enforce a minimum fee rate of 1 sat/vbyte.
-	feeRate := chainfee.SatPerKVByte(req.SatPerByte * 1000).FeePerKWeight()
+	feeRate := chainfee.SatPerKVByte(req.SatPerVbyte * 1000).FeePerKWeight()
 	if feeRate < chainfee.FeePerKwFloor {
 		log.Infof("Manual fee rate input of %d sat/kw is too low, "+
 			"using %d sat/kw instead", feeRate,
@@ -866,7 +866,7 @@ func (s *rpcServer) SubmitOrder(ctx context.Context,
 		}
 		o = &order.Ask{
 			Kit:         *kit,
-			MaxDuration: uint32(a.MaxDurationBlocks),
+			MaxDuration: a.MaxDurationBlocks,
 		}
 
 	case *clmrpc.SubmitOrderRequest_Bid:
@@ -877,7 +877,7 @@ func (s *rpcServer) SubmitOrder(ctx context.Context,
 		}
 		o = &order.Bid{
 			Kit:         *kit,
-			MinDuration: uint32(b.MinDurationBlocks),
+			MinDuration: b.MinDurationBlocks,
 		}
 
 	default:
@@ -972,10 +972,10 @@ func (s *rpcServer) ListOrders(ctx context.Context, _ *clmrpc.ListOrdersRequest)
 
 		dbDetails := dbOrder.Details()
 		details := &clmrpc.Order{
-			UserSubKey:       dbDetails.AcctKey[:],
-			RateFixed:        int64(dbDetails.FixedRate),
-			Amt:              int64(dbDetails.Amt),
-			FundingFeeRate:   int64(dbDetails.FixedRate),
+			TraderKey:        dbDetails.AcctKey[:],
+			RateFixed:        dbDetails.FixedRate,
+			Amt:              uint64(dbDetails.Amt),
+			FundingFeeRate:   uint64(dbDetails.FundingFeeRate),
 			OrderNonce:       nonce[:],
 			State:            state.String(),
 			Units:            uint32(dbDetails.Units),
@@ -986,7 +986,7 @@ func (s *rpcServer) ListOrders(ctx context.Context, _ *clmrpc.ListOrdersRequest)
 		case *order.Ask:
 			rpcAsk := &clmrpc.Ask{
 				Details:           details,
-				MaxDurationBlocks: int64(o.MaxDuration),
+				MaxDurationBlocks: o.MaxDuration,
 				Version:           uint32(o.Version),
 			}
 			asks = append(asks, rpcAsk)
@@ -994,7 +994,7 @@ func (s *rpcServer) ListOrders(ctx context.Context, _ *clmrpc.ListOrdersRequest)
 		case *order.Bid:
 			rpcBid := &clmrpc.Bid{
 				Details:           details,
-				MinDurationBlocks: int64(o.MinDuration),
+				MinDurationBlocks: o.MinDuration,
 				Version:           uint32(o.Version),
 			}
 			bids = append(bids, rpcBid)