diff --git a/clmrpc/trader.pb.go b/clmrpc/trader.pb.go
index 1660b7f..4d45e3c 100644
--- a/clmrpc/trader.pb.go
+++ b/clmrpc/trader.pb.go
@@ -85,11 +85,14 @@ func (AccountState) EnumDescriptor() ([]byte, []int) {
 }
 
 type InitAccountRequest struct {
-	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:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	AccountValue uint64 `protobuf:"varint,1,opt,name=account_value,json=accountValue,proto3" json:"account_value,omitempty"`
+	// Types that are valid to be assigned to AccountExpiry:
+	//	*InitAccountRequest_AbsoluteHeight
+	//	*InitAccountRequest_RelativeHeight
+	AccountExpiry        isInitAccountRequest_AccountExpiry `protobuf_oneof:"account_expiry"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
 }
 
 func (m *InitAccountRequest) Reset()         { *m = InitAccountRequest{} }
@@ -124,13 +127,51 @@ func (m *InitAccountRequest) GetAccountValue() uint64 {
 	return 0
 }
 
-func (m *InitAccountRequest) GetAccountExpiry() uint32 {
+type isInitAccountRequest_AccountExpiry interface {
+	isInitAccountRequest_AccountExpiry()
+}
+
+type InitAccountRequest_AbsoluteHeight struct {
+	AbsoluteHeight uint32 `protobuf:"varint,2,opt,name=absolute_height,json=absoluteHeight,proto3,oneof"`
+}
+
+type InitAccountRequest_RelativeHeight struct {
+	RelativeHeight uint32 `protobuf:"varint,3,opt,name=relative_height,json=relativeHeight,proto3,oneof"`
+}
+
+func (*InitAccountRequest_AbsoluteHeight) isInitAccountRequest_AccountExpiry() {}
+
+func (*InitAccountRequest_RelativeHeight) isInitAccountRequest_AccountExpiry() {}
+
+func (m *InitAccountRequest) GetAccountExpiry() isInitAccountRequest_AccountExpiry {
 	if m != nil {
 		return m.AccountExpiry
 	}
+	return nil
+}
+
+func (m *InitAccountRequest) GetAbsoluteHeight() uint32 {
+	if x, ok := m.GetAccountExpiry().(*InitAccountRequest_AbsoluteHeight); ok {
+		return x.AbsoluteHeight
+	}
 	return 0
 }
 
+func (m *InitAccountRequest) GetRelativeHeight() uint32 {
+	if x, ok := m.GetAccountExpiry().(*InitAccountRequest_RelativeHeight); ok {
+		return x.RelativeHeight
+	}
+	return 0
+}
+
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*InitAccountRequest) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
+		(*InitAccountRequest_AbsoluteHeight)(nil),
+		(*InitAccountRequest_RelativeHeight)(nil),
+	}
+}
+
 type ListAccountsRequest struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1299,87 +1340,89 @@ func init() {
 func init() { proto.RegisterFile("trader.proto", fileDescriptor_b8f61804588c75fe) }
 
 var fileDescriptor_b8f61804588c75fe = []byte{
-	// 1269 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0x1b, 0x45,
-	0x14, 0x8e, 0x93, 0xd8, 0x4e, 0x8e, 0x7f, 0xb2, 0x1d, 0xbb, 0xe9, 0xd6, 0x69, 0xda, 0xb0, 0x05,
-	0x61, 0x52, 0x14, 0x8b, 0x40, 0x6f, 0xe0, 0x02, 0x25, 0xb1, 0x4b, 0x22, 0xaa, 0xd8, 0xda, 0xb4,
-	0x29, 0x08, 0x89, 0x65, 0xbc, 0x3b, 0x4e, 0x47, 0x5e, 0xef, 0x9a, 0xdd, 0x59, 0xd7, 0x11, 0x42,
-	0x42, 0x48, 0x5c, 0x23, 0xc4, 0x1b, 0xf1, 0x0a, 0xbc, 0x42, 0x1f, 0x04, 0xcd, 0xec, 0x8c, 0xbd,
-	0x5e, 0x6f, 0x08, 0xbd, 0xe0, 0xce, 0x7b, 0xbe, 0x33, 0xe7, 0x3b, 0x67, 0xce, 0xdf, 0x18, 0xca,
-	0x2c, 0xc0, 0x0e, 0x09, 0x0e, 0xc6, 0x81, 0xcf, 0x7c, 0x54, 0xb0, 0xdd, 0x51, 0x30, 0xb6, 0x1b,
-	0x0f, 0xae, 0x7c, 0xff, 0xca, 0x25, 0x2d, 0x3c, 0xa6, 0x2d, 0xec, 0x79, 0x3e, 0xc3, 0x8c, 0xfa,
-	0x5e, 0x18, 0x6b, 0x35, 0x34, 0x1c, 0xd9, 0xfc, 0x9b, 0xa8, 0x73, 0xc6, 0x0f, 0x80, 0xce, 0x3c,
-	0xca, 0x8e, 0x6c, 0xdb, 0x8f, 0x3c, 0x66, 0x92, 0x1f, 0x23, 0x12, 0x32, 0xf4, 0x18, 0x2a, 0x38,
-	0x96, 0x58, 0x13, 0xec, 0x46, 0x44, 0xcf, 0xed, 0xe5, 0x9a, 0xeb, 0x66, 0x59, 0x0a, 0x2f, 0xb9,
-	0x0c, 0x7d, 0x00, 0x55, 0xa5, 0x44, 0xa6, 0x63, 0x1a, 0x5c, 0xeb, 0xab, 0x7b, 0xb9, 0x66, 0xc5,
-	0x54, 0x47, 0x3b, 0x42, 0x68, 0xdc, 0x85, 0xda, 0x73, 0x1a, 0x2a, 0x86, 0x50, 0x52, 0x18, 0x27,
-	0x50, 0x5f, 0x14, 0x87, 0x63, 0xdf, 0x0b, 0x09, 0x7a, 0x02, 0x1b, 0xf2, 0x7c, 0xa8, 0xe7, 0xf6,
-	0xd6, 0x9a, 0xa5, 0xc3, 0xad, 0x83, 0x38, 0xb6, 0x03, 0xe5, 0xe4, 0x4c, 0xc1, 0xf8, 0x12, 0x0a,
-	0xdd, 0x88, 0x8d, 0x23, 0x86, 0x76, 0x60, 0x53, 0x78, 0x6a, 0x85, 0x98, 0x49, 0x6f, 0x37, 0x84,
-	0xe0, 0x02, 0x33, 0xa4, 0x43, 0x11, 0x3b, 0x4e, 0x40, 0xc2, 0x50, 0xb8, 0xb8, 0x69, 0xaa, 0x4f,
-	0xe3, 0x7b, 0xa8, 0x9d, 0xb8, 0x7e, 0x48, 0x52, 0xf1, 0xef, 0x02, 0xc4, 0xb7, 0x6b, 0x0d, 0xc9,
-	0xb5, 0x30, 0x57, 0x36, 0x37, 0x63, 0xc9, 0xd7, 0xe4, 0x1a, 0x35, 0xa1, 0xe8, 0x0b, 0x5a, 0x6e,
-	0x8f, 0xbb, 0x58, 0x55, 0x2e, 0xc6, 0xde, 0x98, 0x0a, 0x36, 0x9e, 0x42, 0x7d, 0xd1, 0xbe, 0x8c,
-	0x72, 0x17, 0xc0, 0xe6, 0x72, 0x8b, 0x4d, 0xa9, 0xa3, 0x08, 0x84, 0xe4, 0xc5, 0x94, 0x3a, 0xc6,
-	0x6f, 0x39, 0xd8, 0x7e, 0x45, 0xd9, 0x6b, 0x27, 0xc0, 0x6f, 0xfe, 0x27, 0xd7, 0x90, 0x01, 0x95,
-	0x10, 0x33, 0x6b, 0x4c, 0x02, 0x6b, 0xd2, 0xbf, 0x66, 0x44, 0x5f, 0x13, 0xb7, 0x56, 0x0a, 0x31,
-	0xeb, 0x91, 0xe0, 0x92, 0x8b, 0x0c, 0x0a, 0xf7, 0x96, 0xdc, 0x90, 0x11, 0x7c, 0x04, 0x45, 0x99,
-	0x06, 0xe1, 0x44, 0x46, 0x9a, 0x14, 0xce, 0xab, 0xe9, 0x8d, 0xb4, 0x12, 0xc7, 0xbb, 0x2a, 0xbc,
-	0x2e, 0x2b, 0xa1, 0x08, 0xf9, 0x1a, 0xee, 0xb6, 0xc9, 0xd8, 0x0f, 0x97, 0x6a, 0xf1, 0x96, 0x80,
-	0x77, 0x01, 0xf0, 0x48, 0x14, 0x21, 0xcf, 0xfc, 0xaa, 0x88, 0x61, 0x33, 0x96, 0xf0, 0xd4, 0x67,
-	0x46, 0x59, 0x59, 0x8c, 0x72, 0x00, 0xdb, 0x69, 0xea, 0x77, 0x0f, 0xf2, 0x3d, 0x28, 0x3b, 0xb1,
-	0x91, 0x64, 0x8c, 0x25, 0x29, 0x13, 0x21, 0xbe, 0xcd, 0x41, 0x51, 0x9e, 0xbb, 0x2d, 0xaa, 0x8f,
-	0x61, 0x83, 0xe7, 0xc9, 0xa7, 0x5e, 0x1c, 0x53, 0xe9, 0x50, 0x4b, 0xe4, 0xb1, 0xc7, 0xe5, 0xe6,
-	0x4c, 0x03, 0xd5, 0x21, 0x1f, 0xb7, 0x69, 0x9c, 0xc2, 0xf8, 0x03, 0x3d, 0x81, 0x3b, 0xa2, 0x2f,
-	0xc5, 0x04, 0xb0, 0x5e, 0x13, 0x7a, 0xf5, 0x9a, 0xe9, 0xeb, 0x22, 0x7c, 0x6d, 0x0e, 0x9c, 0x0a,
-	0x39, 0xda, 0x87, 0x7c, 0xc8, 0x30, 0x23, 0x7a, 0x7e, 0x2f, 0xd7, 0xac, 0x1e, 0xd6, 0x53, 0x71,
-	0x5e, 0x70, 0xcc, 0x8c, 0x55, 0x52, 0xc5, 0x5b, 0x48, 0x17, 0x2f, 0x06, 0x74, 0x11, 0xf5, 0x47,
-	0x94, 0x75, 0x03, 0x87, 0x04, 0x2a, 0x8d, 0x8f, 0x60, 0x0d, 0x87, 0x43, 0x79, 0x8d, 0xa5, 0x99,
-	0xf9, 0x70, 0x78, 0xba, 0x62, 0x72, 0x84, 0x2b, 0xf4, 0xe5, 0xbd, 0x25, 0x14, 0x8e, 0xa9, 0xc3,
-	0x15, 0xfa, 0xd4, 0x39, 0xde, 0x84, 0xa2, 0x43, 0x18, 0xa6, 0x6e, 0x68, 0xfc, 0x91, 0x83, 0xda,
-	0x02, 0x87, 0xcc, 0xd7, 0x17, 0x50, 0xa1, 0xde, 0x04, 0xbb, 0xd4, 0xb1, 0x7c, 0x0e, 0x48, 0xba,
-	0x59, 0x34, 0x67, 0x31, 0x28, 0x0e, 0x9d, 0xae, 0x98, 0x65, 0x9a, 0xf8, 0x46, 0x87, 0x50, 0xc7,
-	0xb6, 0x4d, 0xc6, 0x8c, 0xc8, 0xd3, 0x96, 0xe7, 0x7b, 0x36, 0x89, 0x33, 0x79, 0xba, 0x62, 0x22,
-	0x85, 0x0a, 0xf5, 0x73, 0x8e, 0x25, 0x7d, 0xaa, 0xc1, 0x1d, 0x3e, 0xd0, 0x04, 0x38, 0x9b, 0x72,
-	0x97, 0x80, 0x92, 0x42, 0xe9, 0xe6, 0x23, 0x58, 0xc7, 0xe1, 0x50, 0xcd, 0xb7, 0xe4, 0x65, 0x98,
-	0x02, 0xe0, 0x0a, 0x7d, 0xea, 0xa8, 0x16, 0x4e, 0x5e, 0x86, 0x29, 0x00, 0xe3, 0x29, 0xa0, 0x13,
-	0xec, 0xd9, 0xc4, 0x4d, 0xdd, 0x71, 0x29, 0xe9, 0x78, 0x5c, 0x55, 0xe0, 0xcf, 0xdc, 0xe5, 0xb3,
-	0x78, 0xe1, 0x58, 0xec, 0x8f, 0xf1, 0xfb, 0x2a, 0xe4, 0xe3, 0x3b, 0xb8, 0xbd, 0xd9, 0x02, 0xcc,
-	0x88, 0x35, 0xa0, 0x53, 0xe2, 0xc8, 0x71, 0xbf, 0xc9, 0x25, 0xcf, 0xb8, 0x00, 0x69, 0xb0, 0x86,
-	0x47, 0x4c, 0x56, 0x21, 0xff, 0x89, 0x9a, 0xa0, 0x0d, 0x22, 0xcf, 0xa1, 0xde, 0x95, 0x35, 0x20,
-	0xc4, 0xe2, 0xaa, 0xa2, 0x04, 0xd7, 0xcd, 0xaa, 0x94, 0x3f, 0x23, 0xc4, 0xe4, 0x45, 0x95, 0xf2,
-	0x3d, 0x9f, 0xf6, 0x1d, 0x35, 0x55, 0x85, 0x16, 0x44, 0x85, 0xa2, 0x59, 0x3f, 0x70, 0x95, 0x85,
-	0xfa, 0xac, 0x43, 0x3e, 0xf2, 0x28, 0x0b, 0xf5, 0xa2, 0x70, 0x30, 0xfe, 0xe0, 0xed, 0x20, 0x7e,
-	0x58, 0x91, 0x37, 0x88, 0xdc, 0x01, 0x75, 0x5d, 0xe2, 0xe8, 0x1b, 0x71, 0x3b, 0x08, 0xe0, 0xe5,
-	0x5c, 0x6e, 0x4c, 0x61, 0xed, 0x98, 0x3a, 0xe8, 0xc3, 0x59, 0x7a, 0x65, 0x25, 0x55, 0x16, 0x58,
-	0x4d, 0x85, 0xa2, 0x03, 0xa8, 0x8d, 0xa8, 0x67, 0x39, 0x91, 0xec, 0xb6, 0xbe, 0xeb, 0xdb, 0xc3,
-	0x50, 0xde, 0xd0, 0x9d, 0x11, 0xf5, 0xda, 0x12, 0x39, 0x16, 0x00, 0xdf, 0x48, 0x13, 0x12, 0x84,
-	0xd4, 0xf7, 0xe4, 0x40, 0x52, 0x9f, 0x9c, 0xf9, 0x28, 0x1c, 0xbe, 0x1b, 0x33, 0x9e, 0xde, 0xc8,
-	0x8c, 0xa7, 0xff, 0x99, 0x59, 0x87, 0x6d, 0x93, 0xd8, 0xfe, 0x84, 0x04, 0xe9, 0x5d, 0xdd, 0x85,
-	0x7b, 0x4b, 0x88, 0x2c, 0xe5, 0xcf, 0x60, 0xdb, 0x8b, 0x46, 0x56, 0x10, 0xc3, 0xc4, 0xb1, 0x12,
-	0xcb, 0x9b, 0x5b, 0xaf, 0x7b, 0xd1, 0xc8, 0x54, 0xa0, 0x3a, 0xbd, 0xff, 0x4b, 0x0e, 0xca, 0xc9,
-	0xc9, 0x82, 0x34, 0x28, 0xf7, 0x3a, 0xe7, 0xed, 0xb3, 0xf3, 0xaf, 0xac, 0x6e, 0xaf, 0x73, 0xae,
-	0xad, 0x20, 0x04, 0x55, 0x25, 0x79, 0xd9, 0x6b, 0x1f, 0xbd, 0xe8, 0x68, 0x39, 0xb4, 0x01, 0xeb,
-	0x02, 0x5d, 0x45, 0x25, 0x28, 0x76, 0xbe, 0xe9, 0x9d, 0x99, 0x9d, 0xb6, 0xb6, 0x96, 0x54, 0x3d,
-	0x79, 0xde, 0xbd, 0xe8, 0xb4, 0xb5, 0x75, 0x04, 0x50, 0x90, 0xbf, 0xf3, 0xa8, 0x06, 0x5b, 0x66,
-	0xe7, 0xa4, 0x7b, 0xd9, 0x31, 0xbf, 0xb5, 0x9e, 0x1d, 0x9d, 0x3d, 0xef, 0xb4, 0xb5, 0xc2, 0xe1,
-	0x5f, 0x45, 0x28, 0xbc, 0x10, 0x85, 0x8d, 0x5e, 0x41, 0x29, 0xf1, 0x06, 0x42, 0x8d, 0xf9, 0xb4,
-	0x48, 0x2f, 0xa3, 0x46, 0x7a, 0xfe, 0x1b, 0x3b, 0xbf, 0xfe, 0xfd, 0xf6, 0xcf, 0xd5, 0xbb, 0x86,
-	0xd6, 0x9a, 0x7c, 0xd2, 0xb2, 0xdd, 0x51, 0x4b, 0xc5, 0xff, 0x79, 0x6e, 0x1f, 0xd9, 0x50, 0x4e,
-	0xbe, 0x71, 0xd0, 0x8e, 0x3a, 0x9d, 0xf1, 0x20, 0x6a, 0x3c, 0xc8, 0x06, 0x65, 0x8b, 0xea, 0x82,
-	0x07, 0xa1, 0x25, 0x1e, 0x4e, 0x92, 0x7c, 0x62, 0xcc, 0x49, 0x32, 0x1e, 0x36, 0x73, 0x92, 0xac,
-	0x57, 0x89, 0x22, 0xd9, 0x5f, 0x26, 0x99, 0xc2, 0x56, 0xea, 0x21, 0x80, 0x1e, 0x2a, 0x53, 0xd9,
-	0x0f, 0x95, 0xc6, 0xa3, 0x1b, 0x71, 0xc9, 0xf6, 0xbe, 0x60, 0x7b, 0x68, 0xdc, 0x4f, 0xb3, 0xb5,
-	0xd4, 0xc3, 0x80, 0xdf, 0x21, 0x83, 0xea, 0xe2, 0x72, 0x46, 0xbb, 0xca, 0x70, 0xe6, 0x7b, 0xa1,
-	0xf1, 0xf0, 0x26, 0x58, 0xd2, 0x3e, 0x16, 0xb4, 0xbb, 0x86, 0xbe, 0x44, 0x2b, 0x77, 0x35, 0x67,
-	0x7d, 0x03, 0x5b, 0xa9, 0x8a, 0x9f, 0xc7, 0x9b, 0xdd, 0x24, 0xf3, 0x78, 0x6f, 0x68, 0x95, 0x7f,
-	0x21, 0x96, 0xdd, 0xc3, 0x89, 0x31, 0x94, 0x12, 0x8b, 0x6d, 0x5e, 0x8b, 0xcb, 0x1b, 0xb5, 0xb1,
-	0x93, 0x89, 0x49, 0xb2, 0xfb, 0x82, 0xac, 0x66, 0x54, 0x15, 0x99, 0x98, 0xa4, 0xa2, 0x2a, 0xbf,
-	0x03, 0x98, 0xef, 0x24, 0x74, 0x3f, 0x59, 0x76, 0x0b, 0xcb, 0xab, 0xd1, 0xc8, 0x82, 0xa4, 0xfd,
-	0x6d, 0x61, 0x5f, 0x43, 0x29, 0xfb, 0xc8, 0x85, 0x52, 0x62, 0xc3, 0xcc, 0xfd, 0x5f, 0xde, 0x56,
-	0x73, 0xff, 0xb3, 0x56, 0x92, 0x2c, 0x8e, 0xfd, 0x07, 0x8b, 0xf6, 0x5b, 0x3f, 0x25, 0x96, 0xc4,
-	0xcf, 0xfd, 0x82, 0xf8, 0x13, 0xf3, 0xe9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0x0b, 0x8e,
-	0xc1, 0x0c, 0x0d, 0x00, 0x00,
+	// 1299 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0x1b, 0x55,
+	0x10, 0x8e, 0x13, 0xff, 0x24, 0xe3, 0x9f, 0x6c, 0x8f, 0xdd, 0xd4, 0x75, 0x9a, 0x36, 0x6c, 0x91,
+	0x70, 0x53, 0x14, 0x8b, 0x40, 0x6f, 0xe0, 0x02, 0x25, 0xb1, 0x4b, 0x22, 0xaa, 0x24, 0xda, 0xb4,
+	0x29, 0x08, 0x89, 0xd5, 0xf1, 0xee, 0x49, 0x7a, 0xe4, 0xf5, 0xae, 0xd9, 0x3d, 0xeb, 0x3a, 0x42,
+	0x48, 0x08, 0x89, 0x6b, 0x84, 0x78, 0x02, 0x5e, 0x85, 0x57, 0xe0, 0x15, 0xfa, 0x20, 0xe8, 0xfc,
+	0xd9, 0xeb, 0xf5, 0x86, 0xd0, 0x0b, 0xee, 0xbc, 0xf3, 0xcd, 0x99, 0x6f, 0xe6, 0xcc, 0xcc, 0x99,
+	0x31, 0x54, 0x58, 0x88, 0x5d, 0x12, 0xee, 0x8e, 0xc2, 0x80, 0x05, 0xa8, 0xe8, 0x78, 0xc3, 0x70,
+	0xe4, 0xb4, 0x1e, 0x5c, 0x05, 0xc1, 0x95, 0x47, 0x3a, 0x78, 0x44, 0x3b, 0xd8, 0xf7, 0x03, 0x86,
+	0x19, 0x0d, 0xfc, 0x48, 0x6a, 0xb5, 0x0c, 0x1c, 0x3b, 0xfc, 0x9b, 0xe8, 0x73, 0xe6, 0x9f, 0x39,
+	0x40, 0xc7, 0x3e, 0x65, 0xfb, 0x8e, 0x13, 0xc4, 0x3e, 0xb3, 0xc8, 0x0f, 0x31, 0x89, 0x18, 0x7a,
+	0x0c, 0x55, 0x2c, 0x25, 0xf6, 0x18, 0x7b, 0x31, 0x69, 0xe6, 0xb6, 0x73, 0xed, 0xbc, 0x55, 0x51,
+	0xc2, 0x0b, 0x2e, 0x43, 0x4f, 0x60, 0x1d, 0xf7, 0xa3, 0xc0, 0x8b, 0x19, 0xb1, 0xdf, 0x10, 0x7a,
+	0xf5, 0x86, 0x35, 0x97, 0xb7, 0x73, 0xed, 0xea, 0xd1, 0x92, 0x55, 0xd3, 0xc0, 0x91, 0x90, 0x73,
+	0xd5, 0x90, 0x78, 0x98, 0xd1, 0xf1, 0x54, 0x75, 0x45, 0xab, 0x6a, 0x40, 0xaa, 0x1e, 0x18, 0x50,
+	0xd3, 0xd4, 0x64, 0x32, 0xa2, 0xe1, 0xb5, 0x79, 0x17, 0xea, 0x2f, 0x68, 0xa4, 0x5d, 0x8c, 0x94,
+	0x8f, 0xe6, 0x21, 0x34, 0xe6, 0xc5, 0xd1, 0x28, 0xf0, 0x23, 0x82, 0x9e, 0xc2, 0xaa, 0x32, 0x10,
+	0x35, 0x73, 0xdb, 0x2b, 0xed, 0xf2, 0xde, 0xfa, 0xae, 0xbc, 0x9d, 0x5d, 0x1d, 0xe5, 0x54, 0xc1,
+	0xfc, 0x12, 0x8a, 0xa7, 0x31, 0x1b, 0xc5, 0x0c, 0x6d, 0xc2, 0x9a, 0x08, 0xd5, 0x8e, 0x30, 0x53,
+	0xe1, 0xae, 0x0a, 0xc1, 0x39, 0x66, 0xa8, 0x09, 0x25, 0xec, 0xba, 0x21, 0x89, 0x22, 0x11, 0xe2,
+	0x9a, 0xa5, 0x3f, 0xcd, 0xef, 0xa1, 0x7e, 0xe8, 0x05, 0x11, 0x49, 0x5d, 0xe0, 0x16, 0x80, 0xcc,
+	0x8f, 0x3d, 0x20, 0xd7, 0xc2, 0x5c, 0xc5, 0x5a, 0x93, 0x92, 0xaf, 0xc9, 0x35, 0x6a, 0x43, 0x29,
+	0x10, 0xb4, 0xdc, 0x1e, 0x77, 0xb1, 0xa6, 0x5d, 0x94, 0xde, 0x58, 0x1a, 0x36, 0x9f, 0x41, 0x63,
+	0xde, 0xbe, 0x8a, 0x72, 0x0b, 0xc0, 0xe1, 0x72, 0x9b, 0x4d, 0xa8, 0xab, 0x09, 0x84, 0xe4, 0xe5,
+	0x84, 0xba, 0xe6, 0xaf, 0x39, 0xd8, 0x78, 0x4d, 0xd9, 0x1b, 0x37, 0xc4, 0x6f, 0xff, 0x27, 0xd7,
+	0x90, 0x09, 0xd5, 0x08, 0x33, 0x7b, 0x44, 0x42, 0x7b, 0xdc, 0xbf, 0x66, 0x44, 0xa4, 0x34, 0x6f,
+	0x95, 0x23, 0xcc, 0xce, 0x48, 0x78, 0xc1, 0x45, 0x26, 0x85, 0x7b, 0x0b, 0x6e, 0xa8, 0x08, 0x9e,
+	0x40, 0x49, 0xa5, 0x41, 0x38, 0x91, 0x91, 0x26, 0x8d, 0xf3, 0x72, 0x7c, 0xab, 0xac, 0xc8, 0x78,
+	0x97, 0x85, 0xd7, 0x15, 0x2d, 0x14, 0x21, 0x5f, 0xc3, 0xdd, 0x2e, 0x19, 0x05, 0xd1, 0x42, 0x31,
+	0xdf, 0x12, 0xf0, 0x16, 0x00, 0x1e, 0x8a, 0x7a, 0xe3, 0x99, 0x5f, 0x16, 0x31, 0xac, 0x49, 0x09,
+	0x4f, 0x7d, 0x66, 0x94, 0xd5, 0xf9, 0x28, 0x2f, 0x61, 0x23, 0x4d, 0xfd, 0xfe, 0x41, 0x7e, 0x00,
+	0x15, 0x57, 0x1a, 0x49, 0xc6, 0x58, 0x56, 0x32, 0x11, 0xe2, 0xbb, 0x1c, 0x94, 0xd4, 0xb9, 0xdb,
+	0xa2, 0xfa, 0x18, 0x56, 0x79, 0x9e, 0x02, 0xea, 0xcb, 0x98, 0xca, 0x7b, 0x46, 0x22, 0x8f, 0x67,
+	0x5c, 0x6e, 0x4d, 0x35, 0x50, 0x03, 0x0a, 0xb2, 0xcf, 0x65, 0x0a, 0xe5, 0x07, 0x7a, 0x0a, 0x77,
+	0x44, 0x0b, 0x8a, 0x37, 0x44, 0xf7, 0x6d, 0x5e, 0x84, 0x6f, 0xcc, 0x00, 0xd5, 0xe2, 0x3b, 0x50,
+	0x88, 0x18, 0x66, 0xa4, 0x59, 0xd8, 0xce, 0xb5, 0x6b, 0x7b, 0x8d, 0x54, 0x9c, 0xe7, 0x1c, 0xb3,
+	0xa4, 0x4a, 0xaa, 0x78, 0x8b, 0xe9, 0xe2, 0xc5, 0x80, 0xce, 0xe3, 0xfe, 0x90, 0xb2, 0xd3, 0xd0,
+	0x25, 0xa1, 0x4e, 0xe3, 0x23, 0x58, 0xc1, 0xd1, 0x40, 0x5d, 0x63, 0x79, 0x6a, 0x3e, 0x1a, 0x1c,
+	0x2d, 0x59, 0x1c, 0xe1, 0x0a, 0x7d, 0x75, 0x6f, 0x09, 0x85, 0x03, 0xea, 0x72, 0x85, 0x3e, 0x75,
+	0x0f, 0xd6, 0xa0, 0xe4, 0x12, 0x86, 0xa9, 0x17, 0x99, 0xbf, 0xe7, 0xa0, 0x3e, 0xc7, 0xa1, 0xf2,
+	0xf5, 0x05, 0x54, 0xa9, 0x3f, 0xc6, 0x1e, 0x75, 0xed, 0x80, 0x03, 0x8a, 0x6e, 0x1a, 0xcd, 0xb1,
+	0x04, 0xc5, 0xa1, 0xa3, 0x25, 0xab, 0x42, 0x13, 0xdf, 0x68, 0x0f, 0x1a, 0xd8, 0x71, 0xc8, 0x88,
+	0x11, 0x75, 0xda, 0xf6, 0x03, 0xdf, 0x21, 0x32, 0x93, 0x47, 0x4b, 0x16, 0xd2, 0xa8, 0x50, 0x3f,
+	0xe1, 0x58, 0xd2, 0xa7, 0x3a, 0xdc, 0xe1, 0x0f, 0x9a, 0x00, 0xa7, 0xaf, 0xdc, 0x05, 0xa0, 0xa4,
+	0x50, 0xb9, 0xf9, 0x08, 0xf2, 0x38, 0x1a, 0xe8, 0xf7, 0x2d, 0x79, 0x19, 0x96, 0x00, 0xb8, 0x42,
+	0x9f, 0xba, 0xba, 0x85, 0x93, 0x97, 0x61, 0x09, 0xc0, 0x7c, 0x06, 0xe8, 0x10, 0xfb, 0x0e, 0xf1,
+	0x52, 0x77, 0x5c, 0x4e, 0x3a, 0x2e, 0xab, 0x0a, 0x82, 0xa9, 0xbb, 0xfc, 0x2d, 0x9e, 0x3b, 0x26,
+	0xfd, 0x31, 0x7f, 0x5b, 0x86, 0x82, 0xbc, 0x83, 0xdb, 0x9b, 0x2d, 0xc4, 0x8c, 0xd8, 0x97, 0x74,
+	0x42, 0x64, 0xaa, 0xaa, 0xd6, 0x1a, 0x97, 0x3c, 0xe7, 0x02, 0x64, 0xc0, 0x0a, 0x1e, 0x32, 0x55,
+	0x85, 0xfc, 0x27, 0x6a, 0x83, 0x71, 0x19, 0xfb, 0x2e, 0xf5, 0xaf, 0xec, 0x4b, 0x42, 0x6c, 0xae,
+	0x2a, 0x4a, 0x30, 0x6f, 0xd5, 0x94, 0xfc, 0x39, 0x21, 0x16, 0x2f, 0xaa, 0x94, 0xef, 0x85, 0xb4,
+	0xef, 0xa8, 0xad, 0x2b, 0xb4, 0x28, 0x2a, 0x14, 0x4d, 0xfb, 0x81, 0xab, 0xcc, 0xd5, 0x67, 0x03,
+	0x0a, 0xb1, 0x4f, 0x59, 0xd4, 0x2c, 0x09, 0x07, 0xe5, 0x07, 0x6f, 0x07, 0xf1, 0xc3, 0x8e, 0xfd,
+	0xcb, 0xd8, 0xbb, 0xa4, 0x9e, 0x47, 0xdc, 0xe6, 0xaa, 0x6c, 0x07, 0x01, 0xbc, 0x9a, 0xc9, 0xcd,
+	0x09, 0xac, 0x1c, 0x50, 0x17, 0x7d, 0x34, 0x4d, 0xaf, 0xaa, 0xa4, 0xea, 0x1c, 0xab, 0xa5, 0x51,
+	0xb4, 0x0b, 0xf5, 0x21, 0xf5, 0x6d, 0x37, 0x56, 0xdd, 0xd6, 0xf7, 0x02, 0x67, 0x10, 0xa9, 0x1b,
+	0xba, 0x33, 0xa4, 0x7e, 0x57, 0x21, 0x07, 0x02, 0xe0, 0x13, 0x69, 0x4c, 0xc2, 0x88, 0x06, 0xbe,
+	0x7a, 0x90, 0xf4, 0x27, 0x67, 0xde, 0x8f, 0x06, 0xef, 0xc7, 0x8c, 0x27, 0x37, 0x32, 0xe3, 0xc9,
+	0x7f, 0x66, 0x6e, 0xc2, 0x86, 0x45, 0x9c, 0x60, 0x4c, 0xc2, 0xf4, 0xac, 0x3e, 0x85, 0x7b, 0x0b,
+	0x88, 0x2a, 0xe5, 0xcf, 0x60, 0xc3, 0x8f, 0x87, 0x76, 0x28, 0x61, 0xe2, 0xda, 0x89, 0xe1, 0xcd,
+	0xad, 0x37, 0xfc, 0x78, 0x68, 0x69, 0x50, 0x9f, 0xde, 0xf9, 0x39, 0x07, 0x95, 0xe4, 0xcb, 0x82,
+	0x0c, 0xa8, 0x9c, 0xf5, 0x4e, 0xba, 0xc7, 0x27, 0x5f, 0xd9, 0xa7, 0x67, 0xbd, 0x13, 0x63, 0x09,
+	0x21, 0xa8, 0x69, 0xc9, 0xab, 0xb3, 0xee, 0xfe, 0xcb, 0x9e, 0x91, 0x43, 0xab, 0x90, 0x17, 0xe8,
+	0x32, 0x2a, 0x43, 0xa9, 0xf7, 0xcd, 0xd9, 0xb1, 0xd5, 0xeb, 0x1a, 0x2b, 0x49, 0xd5, 0xc3, 0x17,
+	0xa7, 0xe7, 0xbd, 0xae, 0x91, 0x47, 0x00, 0x45, 0xf5, 0xbb, 0x80, 0xea, 0xb0, 0x6e, 0xf5, 0x0e,
+	0x4f, 0x2f, 0x7a, 0xd6, 0xb7, 0xf6, 0xf3, 0xfd, 0xe3, 0x17, 0xbd, 0xae, 0x51, 0xdc, 0xfb, 0xab,
+	0x04, 0xc5, 0x97, 0xa2, 0xb0, 0xd1, 0x6b, 0x28, 0x27, 0x96, 0x28, 0xd4, 0x9a, 0xbd, 0x16, 0xe9,
+	0x61, 0xd4, 0x4a, 0xbf, 0xff, 0xe6, 0xe6, 0x2f, 0x7f, 0xbf, 0xfb, 0x63, 0xf9, 0xae, 0x69, 0x74,
+	0xc6, 0x9f, 0x74, 0x1c, 0x6f, 0xd8, 0xd1, 0xf1, 0x7f, 0x9e, 0xdb, 0x41, 0x0e, 0x54, 0x92, 0x3b,
+	0x0e, 0xda, 0xd4, 0xa7, 0x33, 0x16, 0xa2, 0xd6, 0x83, 0x6c, 0x50, 0xb5, 0x68, 0x53, 0xf0, 0x20,
+	0xb4, 0xc0, 0xc3, 0x49, 0x92, 0x2b, 0xc6, 0x8c, 0x24, 0x63, 0xb1, 0x99, 0x91, 0x64, 0x6d, 0x25,
+	0x9a, 0x64, 0x67, 0x91, 0x64, 0x02, 0xeb, 0xa9, 0x45, 0x00, 0x3d, 0xd4, 0xa6, 0xb2, 0x17, 0x95,
+	0xd6, 0xa3, 0x1b, 0x71, 0xc5, 0xf6, 0xa1, 0x60, 0x7b, 0x68, 0xde, 0x4f, 0xb3, 0x75, 0xf4, 0x62,
+	0xc0, 0xef, 0x90, 0x41, 0x6d, 0x7e, 0x38, 0xa3, 0x2d, 0x6d, 0x38, 0x73, 0x5f, 0x68, 0x3d, 0xbc,
+	0x09, 0x56, 0xb4, 0x8f, 0x05, 0xed, 0x96, 0xd9, 0x5c, 0xa0, 0x55, 0xb3, 0x9a, 0xb3, 0xbe, 0x85,
+	0xf5, 0x54, 0xc5, 0xcf, 0xe2, 0xcd, 0x6e, 0x92, 0x59, 0xbc, 0x37, 0xb4, 0xca, 0xbf, 0x10, 0xab,
+	0xee, 0xe1, 0xc4, 0x18, 0xca, 0x89, 0xc1, 0x36, 0xab, 0xc5, 0xc5, 0x89, 0xda, 0xda, 0xcc, 0xc4,
+	0x14, 0xd9, 0x7d, 0x41, 0x56, 0x37, 0x6b, 0x9a, 0x4c, 0xbc, 0xa4, 0xa2, 0x2a, 0xbf, 0x03, 0x98,
+	0xcd, 0x24, 0x74, 0x3f, 0x59, 0x76, 0x73, 0xc3, 0xab, 0xd5, 0xca, 0x82, 0x94, 0xfd, 0x0d, 0x61,
+	0xdf, 0x40, 0x29, 0xfb, 0xc8, 0x83, 0x72, 0x62, 0xc2, 0xcc, 0xfc, 0x5f, 0x9c, 0x56, 0x33, 0xff,
+	0xb3, 0x46, 0x92, 0x2a, 0x8e, 0x9d, 0x07, 0xf3, 0xf6, 0x3b, 0x3f, 0x26, 0x86, 0xc4, 0x4f, 0xfd,
+	0xa2, 0xf8, 0x1b, 0xf4, 0xe9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x16, 0x2f, 0x88, 0xd1, 0x4e,
+	0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/clmrpc/trader.proto b/clmrpc/trader.proto
index abbf067..426b8d1 100644
--- a/clmrpc/trader.proto
+++ b/clmrpc/trader.proto
@@ -68,7 +68,11 @@ service Trader {
 
 message InitAccountRequest {
     uint64 account_value = 1;
-    uint32 account_expiry = 2;
+
+    oneof account_expiry {
+        uint32 absolute_height = 2;
+        uint32 relative_height = 3;
+    }
 }
 
 message ListAccountsRequest {
diff --git a/clmrpc/trader.swagger.json b/clmrpc/trader.swagger.json
index 89355e9..2f8d48c 100644
--- a/clmrpc/trader.swagger.json
+++ b/clmrpc/trader.swagger.json
@@ -420,7 +420,11 @@
           "type": "string",
           "format": "uint64"
         },
-        "account_expiry": {
+        "absolute_height": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "relative_height": {
           "type": "integer",
           "format": "int64"
         }