Fix lint errors

.gitea/workflows/test-sdk-auction.yml

@@ -7,7 +7,7 @@ on:
       - release/**
 
 jobs:
-  sdk_tests_authority_auctions:
+  sdk_tests_auctions:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -35,6 +35,6 @@ jobs:
           TEST_AUCTION_ENABLED: true
         run: docker compose up -d
 
-      - name: Run authority auction tests
+      - name: Run auction tests
         working-directory: tests/sdk_tests
-        run: ./run-tests.sh test:authority-auctions
+        run: ./run-tests.sh test:auctions

Dockerfile

@@ -19,7 +19,7 @@ FROM ubuntu:22.04
 # Install ca-certificates, jq, curl, bash, and other necessary packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
-    jq curl netcat bash bc \
+    jq curl netcat bash \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy over binary from the builder

Makefile

@@ -43,7 +43,7 @@ build-linux:
 
 $(BUILD_TARGETS): go.sum $(BUILDDIR)/
 	@echo "--> installing laconicd"
-	go $@ $(BUILD_FLAGS) $(BUILD_ARGS) ./cmd/laconicd
+	go $@ $(BUILD_FLAGS) $(BUILD_ARGS) ./...
 
 $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/

README.md

@@ -27,8 +27,6 @@ Run with a single node fixture:
   ./scripts/init.sh clean
   ```
 
-See [lockup.md](./lockup.md) for lockup account usage.
-
 ## Tests
 
 Run tests:

api/cerc/auction/v1/tx_grpc.pb.go

@@ -23,7 +23,6 @@ const (
 	Msg_CommitBid_FullMethodName     = "/cerc.auction.v1.Msg/CommitBid"
 	Msg_RevealBid_FullMethodName     = "/cerc.auction.v1.Msg/RevealBid"
 	Msg_UpdateParams_FullMethodName  = "/cerc.auction.v1.Msg/UpdateParams"
-	Msg_ReleaseFunds_FullMethodName  = "/cerc.auction.v1.Msg/ReleaseFunds"
 )
 
 // MsgClient is the client API for Msg service.
@@ -39,8 +38,6 @@ type MsgClient interface {
 	// UpdateParams defines an operation for updating the x/staking module
 	// parameters.
 	UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error)
-	// ReleaseFunds is the command for paying the winners of provider auctions
-	ReleaseFunds(ctx context.Context, in *MsgReleaseFunds, opts ...grpc.CallOption) (*MsgReleaseFundsResponse, error)
 }
 
 type msgClient struct {
@@ -87,15 +84,6 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts
 	return out, nil
 }
 
-func (c *msgClient) ReleaseFunds(ctx context.Context, in *MsgReleaseFunds, opts ...grpc.CallOption) (*MsgReleaseFundsResponse, error) {
-	out := new(MsgReleaseFundsResponse)
-	err := c.cc.Invoke(ctx, Msg_ReleaseFunds_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // MsgServer is the server API for Msg service.
 // All implementations must embed UnimplementedMsgServer
 // for forward compatibility
@@ -109,8 +97,6 @@ type MsgServer interface {
 	// UpdateParams defines an operation for updating the x/staking module
 	// parameters.
 	UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error)
-	// ReleaseFunds is the command for paying the winners of provider auctions
-	ReleaseFunds(context.Context, *MsgReleaseFunds) (*MsgReleaseFundsResponse, error)
 	mustEmbedUnimplementedMsgServer()
 }
 
@@ -130,9 +116,6 @@ func (UnimplementedMsgServer) RevealBid(context.Context, *MsgRevealBid) (*MsgRev
 func (UnimplementedMsgServer) UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented")
 }
-func (UnimplementedMsgServer) ReleaseFunds(context.Context, *MsgReleaseFunds) (*MsgReleaseFundsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReleaseFunds not implemented")
-}
 func (UnimplementedMsgServer) mustEmbedUnimplementedMsgServer() {}
 
 // UnsafeMsgServer may be embedded to opt out of forward compatibility for this service.
@@ -218,24 +201,6 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Msg_ReleaseFunds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgReleaseFunds)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MsgServer).ReleaseFunds(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Msg_ReleaseFunds_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).ReleaseFunds(ctx, req.(*MsgReleaseFunds))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // Msg_ServiceDesc is the grpc.ServiceDesc for Msg service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -259,10 +224,6 @@ var Msg_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateParams",
 			Handler:    _Msg_UpdateParams_Handler,
 		},
-		{
-			MethodName: "ReleaseFunds",
-			Handler:    _Msg_ReleaseFunds_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "cerc/auction/v1/tx.proto",

api/cerc/types/v1/lockup.pulsar.go

@@ -1,755 +0,0 @@
-// Code generated by protoc-gen-go-pulsar. DO NOT EDIT.
-package typesv1
-
-import (
-	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
-	runtime "github.com/cosmos/cosmos-proto/runtime"
-	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
-	types "github.com/cosmos/cosmos-sdk/x/auth/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoiface "google.golang.org/protobuf/runtime/protoiface"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	io "io"
-	reflect "reflect"
-	sync "sync"
-)
-
-var (
-	md_LockupAccount              protoreflect.MessageDescriptor
-	fd_LockupAccount_base_account protoreflect.FieldDescriptor
-	fd_LockupAccount_name         protoreflect.FieldDescriptor
-	fd_LockupAccount_distribution protoreflect.FieldDescriptor
-)
-
-func init() {
-	file_cerc_types_v1_lockup_proto_init()
-	md_LockupAccount = File_cerc_types_v1_lockup_proto.Messages().ByName("LockupAccount")
-	fd_LockupAccount_base_account = md_LockupAccount.Fields().ByName("base_account")
-	fd_LockupAccount_name = md_LockupAccount.Fields().ByName("name")
-	fd_LockupAccount_distribution = md_LockupAccount.Fields().ByName("distribution")
-}
-
-var _ protoreflect.Message = (*fastReflection_LockupAccount)(nil)
-
-type fastReflection_LockupAccount LockupAccount
-
-func (x *LockupAccount) ProtoReflect() protoreflect.Message {
-	return (*fastReflection_LockupAccount)(x)
-}
-
-func (x *LockupAccount) slowProtoReflect() protoreflect.Message {
-	mi := &file_cerc_types_v1_lockup_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-var _fastReflection_LockupAccount_messageType fastReflection_LockupAccount_messageType
-var _ protoreflect.MessageType = fastReflection_LockupAccount_messageType{}
-
-type fastReflection_LockupAccount_messageType struct{}
-
-func (x fastReflection_LockupAccount_messageType) Zero() protoreflect.Message {
-	return (*fastReflection_LockupAccount)(nil)
-}
-func (x fastReflection_LockupAccount_messageType) New() protoreflect.Message {
-	return new(fastReflection_LockupAccount)
-}
-func (x fastReflection_LockupAccount_messageType) Descriptor() protoreflect.MessageDescriptor {
-	return md_LockupAccount
-}
-
-// Descriptor returns message descriptor, which contains only the protobuf
-// type information for the message.
-func (x *fastReflection_LockupAccount) Descriptor() protoreflect.MessageDescriptor {
-	return md_LockupAccount
-}
-
-// Type returns the message type, which encapsulates both Go and protobuf
-// type information. If the Go type information is not needed,
-// it is recommended that the message descriptor be used instead.
-func (x *fastReflection_LockupAccount) Type() protoreflect.MessageType {
-	return _fastReflection_LockupAccount_messageType
-}
-
-// New returns a newly allocated and mutable empty message.
-func (x *fastReflection_LockupAccount) New() protoreflect.Message {
-	return new(fastReflection_LockupAccount)
-}
-
-// Interface unwraps the message reflection interface and
-// returns the underlying ProtoMessage interface.
-func (x *fastReflection_LockupAccount) Interface() protoreflect.ProtoMessage {
-	return (*LockupAccount)(x)
-}
-
-// Range iterates over every populated field in an undefined order,
-// calling f for each field descriptor and value encountered.
-// Range returns immediately if f returns false.
-// While iterating, mutating operations may only be performed
-// on the current field descriptor.
-func (x *fastReflection_LockupAccount) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
-	if x.BaseAccount != nil {
-		value := protoreflect.ValueOfMessage(x.BaseAccount.ProtoReflect())
-		if !f(fd_LockupAccount_base_account, value) {
-			return
-		}
-	}
-	if x.Name != "" {
-		value := protoreflect.ValueOfString(x.Name)
-		if !f(fd_LockupAccount_name, value) {
-			return
-		}
-	}
-	if x.Distribution != "" {
-		value := protoreflect.ValueOfString(x.Distribution)
-		if !f(fd_LockupAccount_distribution, value) {
-			return
-		}
-	}
-}
-
-// Has reports whether a field is populated.
-//
-// Some fields have the property of nullability where it is possible to
-// distinguish between the default value of a field and whether the field
-// was explicitly populated with the default value. Singular message fields,
-// member fields of a oneof, and proto2 scalar fields are nullable. Such
-// fields are populated only if explicitly set.
-//
-// In other cases (aside from the nullable cases above),
-// a proto3 scalar field is populated if it contains a non-zero value, and
-// a repeated field is populated if it is non-empty.
-func (x *fastReflection_LockupAccount) Has(fd protoreflect.FieldDescriptor) bool {
-	switch fd.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		return x.BaseAccount != nil
-	case "cerc.types.v1.LockupAccount.name":
-		return x.Name != ""
-	case "cerc.types.v1.LockupAccount.distribution":
-		return x.Distribution != ""
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", fd.FullName()))
-	}
-}
-
-// Clear clears the field such that a subsequent Has call reports false.
-//
-// Clearing an extension field clears both the extension type and value
-// associated with the given field number.
-//
-// Clear is a mutating operation and unsafe for concurrent use.
-func (x *fastReflection_LockupAccount) Clear(fd protoreflect.FieldDescriptor) {
-	switch fd.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		x.BaseAccount = nil
-	case "cerc.types.v1.LockupAccount.name":
-		x.Name = ""
-	case "cerc.types.v1.LockupAccount.distribution":
-		x.Distribution = ""
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", fd.FullName()))
-	}
-}
-
-// Get retrieves the value for a field.
-//
-// For unpopulated scalars, it returns the default value, where
-// the default value of a bytes scalar is guaranteed to be a copy.
-// For unpopulated composite types, it returns an empty, read-only view
-// of the value; to obtain a mutable reference, use Mutable.
-func (x *fastReflection_LockupAccount) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
-	switch descriptor.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		value := x.BaseAccount
-		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cerc.types.v1.LockupAccount.name":
-		value := x.Name
-		return protoreflect.ValueOfString(value)
-	case "cerc.types.v1.LockupAccount.distribution":
-		value := x.Distribution
-		return protoreflect.ValueOfString(value)
-	default:
-		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", descriptor.FullName()))
-	}
-}
-
-// Set stores the value for a field.
-//
-// For a field belonging to a oneof, it implicitly clears any other field
-// that may be currently set within the same oneof.
-// For extension fields, it implicitly stores the provided ExtensionType.
-// When setting a composite type, it is unspecified whether the stored value
-// aliases the source's memory in any way. If the composite value is an
-// empty, read-only value, then it panics.
-//
-// Set is a mutating operation and unsafe for concurrent use.
-func (x *fastReflection_LockupAccount) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
-	switch fd.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		x.BaseAccount = value.Message().Interface().(*types.BaseAccount)
-	case "cerc.types.v1.LockupAccount.name":
-		x.Name = value.Interface().(string)
-	case "cerc.types.v1.LockupAccount.distribution":
-		x.Distribution = value.Interface().(string)
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", fd.FullName()))
-	}
-}
-
-// Mutable returns a mutable reference to a composite type.
-//
-// If the field is unpopulated, it may allocate a composite value.
-// For a field belonging to a oneof, it implicitly clears any other field
-// that may be currently set within the same oneof.
-// For extension fields, it implicitly stores the provided ExtensionType
-// if not already stored.
-// It panics if the field does not contain a composite type.
-//
-// Mutable is a mutating operation and unsafe for concurrent use.
-func (x *fastReflection_LockupAccount) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
-	switch fd.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		if x.BaseAccount == nil {
-			x.BaseAccount = new(types.BaseAccount)
-		}
-		return protoreflect.ValueOfMessage(x.BaseAccount.ProtoReflect())
-	case "cerc.types.v1.LockupAccount.name":
-		panic(fmt.Errorf("field name of message cerc.types.v1.LockupAccount is not mutable"))
-	case "cerc.types.v1.LockupAccount.distribution":
-		panic(fmt.Errorf("field distribution of message cerc.types.v1.LockupAccount is not mutable"))
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", fd.FullName()))
-	}
-}
-
-// NewField returns a new value that is assignable to the field
-// for the given descriptor. For scalars, this returns the default value.
-// For lists, maps, and messages, this returns a new, empty, mutable value.
-func (x *fastReflection_LockupAccount) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
-	switch fd.FullName() {
-	case "cerc.types.v1.LockupAccount.base_account":
-		m := new(types.BaseAccount)
-		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cerc.types.v1.LockupAccount.name":
-		return protoreflect.ValueOfString("")
-	case "cerc.types.v1.LockupAccount.distribution":
-		return protoreflect.ValueOfString("")
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cerc.types.v1.LockupAccount"))
-		}
-		panic(fmt.Errorf("message cerc.types.v1.LockupAccount does not contain field %s", fd.FullName()))
-	}
-}
-
-// WhichOneof reports which field within the oneof is populated,
-// returning nil if none are populated.
-// It panics if the oneof descriptor does not belong to this message.
-func (x *fastReflection_LockupAccount) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
-	switch d.FullName() {
-	default:
-		panic(fmt.Errorf("%s is not a oneof field in cerc.types.v1.LockupAccount", d.FullName()))
-	}
-	panic("unreachable")
-}
-
-// GetUnknown retrieves the entire list of unknown fields.
-// The caller may only mutate the contents of the RawFields
-// if the mutated bytes are stored back into the message with SetUnknown.
-func (x *fastReflection_LockupAccount) GetUnknown() protoreflect.RawFields {
-	return x.unknownFields
-}
-
-// SetUnknown stores an entire list of unknown fields.
-// The raw fields must be syntactically valid according to the wire format.
-// An implementation may panic if this is not the case.
-// Once stored, the caller must not mutate the content of the RawFields.
-// An empty RawFields may be passed to clear the fields.
-//
-// SetUnknown is a mutating operation and unsafe for concurrent use.
-func (x *fastReflection_LockupAccount) SetUnknown(fields protoreflect.RawFields) {
-	x.unknownFields = fields
-}
-
-// IsValid reports whether the message is valid.
-//
-// An invalid message is an empty, read-only value.
-//
-// An invalid message often corresponds to a nil pointer of the concrete
-// message type, but the details are implementation dependent.
-// Validity is not part of the protobuf data model, and may not
-// be preserved in marshaling or other operations.
-func (x *fastReflection_LockupAccount) IsValid() bool {
-	return x != nil
-}
-
-// ProtoMethods returns optional fastReflectionFeature-path implementations of various operations.
-// This method may return nil.
-//
-// The returned methods type is identical to
-// "google.golang.org/protobuf/runtime/protoiface".Methods.
-// Consult the protoiface package documentation for details.
-func (x *fastReflection_LockupAccount) ProtoMethods() *protoiface.Methods {
-	size := func(input protoiface.SizeInput) protoiface.SizeOutput {
-		x := input.Message.Interface().(*LockupAccount)
-		if x == nil {
-			return protoiface.SizeOutput{
-				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-				Size:              0,
-			}
-		}
-		options := runtime.SizeInputToOptions(input)
-		_ = options
-		var n int
-		var l int
-		_ = l
-		if x.BaseAccount != nil {
-			l = options.Size(x.BaseAccount)
-			n += 1 + l + runtime.Sov(uint64(l))
-		}
-		l = len(x.Name)
-		if l > 0 {
-			n += 1 + l + runtime.Sov(uint64(l))
-		}
-		l = len(x.Distribution)
-		if l > 0 {
-			n += 1 + l + runtime.Sov(uint64(l))
-		}
-		if x.unknownFields != nil {
-			n += len(x.unknownFields)
-		}
-		return protoiface.SizeOutput{
-			NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-			Size:              n,
-		}
-	}
-
-	marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) {
-		x := input.Message.Interface().(*LockupAccount)
-		if x == nil {
-			return protoiface.MarshalOutput{
-				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-				Buf:               input.Buf,
-			}, nil
-		}
-		options := runtime.MarshalInputToOptions(input)
-		_ = options
-		size := options.Size(x)
-		dAtA := make([]byte, size)
-		i := len(dAtA)
-		_ = i
-		var l int
-		_ = l
-		if x.unknownFields != nil {
-			i -= len(x.unknownFields)
-			copy(dAtA[i:], x.unknownFields)
-		}
-		if len(x.Distribution) > 0 {
-			i -= len(x.Distribution)
-			copy(dAtA[i:], x.Distribution)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Distribution)))
-			i--
-			dAtA[i] = 0x1a
-		}
-		if len(x.Name) > 0 {
-			i -= len(x.Name)
-			copy(dAtA[i:], x.Name)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Name)))
-			i--
-			dAtA[i] = 0x12
-		}
-		if x.BaseAccount != nil {
-			encoded, err := options.Marshal(x.BaseAccount)
-			if err != nil {
-				return protoiface.MarshalOutput{
-					NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-					Buf:               input.Buf,
-				}, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded)))
-			i--
-			dAtA[i] = 0xa
-		}
-		if input.Buf != nil {
-			input.Buf = append(input.Buf, dAtA...)
-		} else {
-			input.Buf = dAtA
-		}
-		return protoiface.MarshalOutput{
-			NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-			Buf:               input.Buf,
-		}, nil
-	}
-	unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) {
-		x := input.Message.Interface().(*LockupAccount)
-		if x == nil {
-			return protoiface.UnmarshalOutput{
-				NoUnkeyedLiterals: input.NoUnkeyedLiterals,
-				Flags:             input.Flags,
-			}, nil
-		}
-		options := runtime.UnmarshalInputToOptions(input)
-		_ = options
-		dAtA := input.Buf
-		l := len(dAtA)
-		iNdEx := 0
-		for iNdEx < l {
-			preIndex := iNdEx
-			var wire uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
-				}
-				if iNdEx >= l {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				wire |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			fieldNum := int32(wire >> 3)
-			wireType := int(wire & 0x7)
-			if wireType == 4 {
-				return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: LockupAccount: wiretype end group for non-group")
-			}
-			if fieldNum <= 0 {
-				return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: LockupAccount: illegal tag %d (wire type %d)", fieldNum, wire)
-			}
-			switch fieldNum {
-			case 1:
-				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field BaseAccount", wireType)
-				}
-				var msglen int
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
-					}
-					if iNdEx >= l {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					msglen |= int(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				if msglen < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				postIndex := iNdEx + msglen
-				if postIndex < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				if postIndex > l {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-				}
-				if x.BaseAccount == nil {
-					x.BaseAccount = &types.BaseAccount{}
-				}
-				if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.BaseAccount); err != nil {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
-				}
-				iNdEx = postIndex
-			case 2:
-				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
-				}
-				var stringLen uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
-					}
-					if iNdEx >= l {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					stringLen |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				intStringLen := int(stringLen)
-				if intStringLen < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				postIndex := iNdEx + intStringLen
-				if postIndex < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				if postIndex > l {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-				}
-				x.Name = string(dAtA[iNdEx:postIndex])
-				iNdEx = postIndex
-			case 3:
-				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Distribution", wireType)
-				}
-				var stringLen uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
-					}
-					if iNdEx >= l {
-						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					stringLen |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				intStringLen := int(stringLen)
-				if intStringLen < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				postIndex := iNdEx + intStringLen
-				if postIndex < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				if postIndex > l {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-				}
-				x.Distribution = string(dAtA[iNdEx:postIndex])
-				iNdEx = postIndex
-			default:
-				iNdEx = preIndex
-				skippy, err := runtime.Skip(dAtA[iNdEx:])
-				if err != nil {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
-				}
-				if (skippy < 0) || (iNdEx+skippy) < 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
-				}
-				if (iNdEx + skippy) > l {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-				}
-				if !options.DiscardUnknown {
-					x.unknownFields = append(x.unknownFields, dAtA[iNdEx:iNdEx+skippy]...)
-				}
-				iNdEx += skippy
-			}
-		}
-
-		if iNdEx > l {
-			return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
-		}
-		return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, nil
-	}
-	return &protoiface.Methods{
-		NoUnkeyedLiterals: struct{}{},
-		Flags:             protoiface.SupportMarshalDeterministic | protoiface.SupportUnmarshalDiscardUnknown,
-		Size:              size,
-		Marshal:           marshal,
-		Unmarshal:         unmarshal,
-		Merge:             nil,
-		CheckInitialized:  nil,
-	}
-}
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.27.0
-// 	protoc        (unknown)
-// source: cerc/types/v1/lockup.proto
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// LockupAccount extends the Cosmos SDK BaseAccount with a name and distribution
-// field. It satisfies the ModuleAccountI interface to allow querying it as a
-// module account.
-type LockupAccount struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BaseAccount  *types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3" json:"base_account,omitempty"`
-	Name         string             `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Distribution string             `protobuf:"bytes,3,opt,name=distribution,proto3" json:"distribution,omitempty"`
-}
-
-func (x *LockupAccount) Reset() {
-	*x = LockupAccount{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_cerc_types_v1_lockup_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LockupAccount) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LockupAccount) ProtoMessage() {}
-
-// Deprecated: Use LockupAccount.ProtoReflect.Descriptor instead.
-func (*LockupAccount) Descriptor() ([]byte, []int) {
-	return file_cerc_types_v1_lockup_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *LockupAccount) GetBaseAccount() *types.BaseAccount {
-	if x != nil {
-		return x.BaseAccount
-	}
-	return nil
-}
-
-func (x *LockupAccount) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *LockupAccount) GetDistribution() string {
-	if x != nil {
-		return x.Distribution
-	}
-	return ""
-}
-
-var File_cerc_types_v1_lockup_proto protoreflect.FileDescriptor
-
-var file_cerc_types_v1_lockup_proto_rawDesc = []byte{
-	0x0a, 0x1a, 0x63, 0x65, 0x72, 0x63, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f,
-	0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x63, 0x65,
-	0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x11, 0x61, 0x6d, 0x69,
-	0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19,
-	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f,
-	0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x61,
-	0x75, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x8b, 0x02, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x49, 0x0a, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61,
-	0x73, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52,
-	0x0b, 0x62, 0x61, 0x73, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75,
-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x77, 0x88, 0xa0, 0x1f, 0x00, 0xca, 0xb4, 0x2d, 0x22, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49,
-	0xca, 0xb4, 0x2d, 0x1c, 0x63, 0x65, 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76,
-	0x31, 0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49,
-	0x8a, 0xe7, 0xb0, 0x2a, 0x15, 0x6c, 0x61, 0x63, 0x6f, 0x6e, 0x69, 0x63, 0x2f, 0x4c, 0x6f, 0x63,
-	0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x92, 0xe7, 0xb0, 0x2a, 0x0e, 0x6c,
-	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0xad, 0x01,
-	0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x65, 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73,
-	0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x76, 0x64, 0x62, 0x2e, 0x74, 0x6f, 0x2f, 0x63,
-	0x65, 0x72, 0x63, 0x2d, 0x69, 0x6f, 0x2f, 0x6c, 0x61, 0x63, 0x6f, 0x6e, 0x69, 0x63, 0x64, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x63, 0x65, 0x72, 0x63, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76,
-	0x31, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa,
-	0x02, 0x0d, 0x43, 0x65, 0x72, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca,
-	0x02, 0x0d, 0x43, 0x65, 0x72, 0x63, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0xe2,
-	0x02, 0x19, 0x43, 0x65, 0x72, 0x63, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0f, 0x43, 0x65,
-	0x72, 0x63, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_cerc_types_v1_lockup_proto_rawDescOnce sync.Once
-	file_cerc_types_v1_lockup_proto_rawDescData = file_cerc_types_v1_lockup_proto_rawDesc
-)
-
-func file_cerc_types_v1_lockup_proto_rawDescGZIP() []byte {
-	file_cerc_types_v1_lockup_proto_rawDescOnce.Do(func() {
-		file_cerc_types_v1_lockup_proto_rawDescData = protoimpl.X.CompressGZIP(file_cerc_types_v1_lockup_proto_rawDescData)
-	})
-	return file_cerc_types_v1_lockup_proto_rawDescData
-}
-
-var file_cerc_types_v1_lockup_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_cerc_types_v1_lockup_proto_goTypes = []interface{}{
-	(*LockupAccount)(nil),     // 0: cerc.types.v1.LockupAccount
-	(*types.BaseAccount)(nil), // 1: cosmos.auth.v1beta1.BaseAccount
-}
-var file_cerc_types_v1_lockup_proto_depIdxs = []int32{
-	1, // 0: cerc.types.v1.LockupAccount.base_account:type_name -> cosmos.auth.v1beta1.BaseAccount
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_cerc_types_v1_lockup_proto_init() }
-func file_cerc_types_v1_lockup_proto_init() {
-	if File_cerc_types_v1_lockup_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_cerc_types_v1_lockup_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LockupAccount); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_cerc_types_v1_lockup_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_cerc_types_v1_lockup_proto_goTypes,
-		DependencyIndexes: file_cerc_types_v1_lockup_proto_depIdxs,
-		MessageInfos:      file_cerc_types_v1_lockup_proto_msgTypes,
-	}.Build()
-	File_cerc_types_v1_lockup_proto = out.File
-	file_cerc_types_v1_lockup_proto_rawDesc = nil
-	file_cerc_types_v1_lockup_proto_goTypes = nil
-	file_cerc_types_v1_lockup_proto_depIdxs = nil
-}

app/ante.go

@@ -1,79 +0,0 @@
-package app
-
-import (
-	_ "embed"
-	"math"
-
-	errorsmod "cosmossdk.io/errors"
-	sdkmath "cosmossdk.io/math"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-
-	"git.vdb.to/cerc-io/laconicd/app/params"
-)
-
-// Reference: https://github.com/cosmos/cosmos-sdk/blob/v0.50.10/x/auth/ante/validator_tx_fee.go#L15
-
-// checkTxFeeWithValidatorMinGasPrices implements the default fee logic, where the minimum price per
-// unit of gas is fixed and set by each validator, can the tx priority is computed from the gas price.
-func checkTxFeeWithValidatorMinGasPrices(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, int64, error) {
-	feeTx, ok := tx.(sdk.FeeTx)
-	if !ok {
-		return nil, 0, errorsmod.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
-	}
-
-	feeCoins := feeTx.GetFee()
-	gas := feeTx.GetGas()
-
-	// Only allow alnt as a fee token
-	for _, coin := range feeCoins {
-		if coin.Denom != params.CoinUnit {
-			return nil, 0, errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "invalid fee denom %s, only %s is accepted", coin.Denom, params.CoinUnit)
-		}
-	}
-
-	// Ensure that the provided fees meet a minimum threshold for the validator,
-	// if this is a CheckTx. This is only for local mempool purposes, and thus
-	// is only ran on check tx.
-	if ctx.IsCheckTx() {
-		minGasPrices := ctx.MinGasPrices()
-		if !minGasPrices.IsZero() {
-			requiredFees := make(sdk.Coins, len(minGasPrices))
-
-			// Determine the required fees by multiplying each required minimum gas
-			// price by the gas limit, where fee = ceil(minGasPrice * gasLimit).
-			glDec := sdkmath.LegacyNewDec(int64(gas))
-			for i, gp := range minGasPrices {
-				fee := gp.Amount.Mul(glDec)
-				requiredFees[i] = sdk.NewCoin(gp.Denom, fee.Ceil().RoundInt())
-			}
-
-			if !feeCoins.IsAnyGTE(requiredFees) {
-				return nil, 0, errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeCoins, requiredFees)
-			}
-		}
-	}
-
-	priority := getTxPriority(feeCoins, int64(gas))
-	return feeCoins, priority, nil
-}
-
-// getTxPriority returns a naive tx priority based on the amount of the smallest denomination of the gas price
-// provided in a transaction.
-// NOTE: This implementation should be used with a great consideration as it opens potential attack vectors
-// where txs with multiple coins could not be prioritize as expected.
-func getTxPriority(fee sdk.Coins, gas int64) int64 {
-	var priority int64
-	for _, c := range fee {
-		p := int64(math.MaxInt64)
-		gasPrice := c.Amount.QuoRaw(gas)
-		if gasPrice.IsInt64() {
-			p = gasPrice.Int64()
-		}
-		if priority == 0 || p < priority {
-			priority = p
-		}
-	}
-
-	return priority
-}

app/app.go

@@ -12,13 +12,11 @@ import (
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
-	evidencekeeper "cosmossdk.io/x/evidence/keeper"
 
 	auctionkeeper "git.vdb.to/cerc-io/laconicd/x/auction/keeper"
 	bondkeeper "git.vdb.to/cerc-io/laconicd/x/bond/keeper"
 	onboardingkeeper "git.vdb.to/cerc-io/laconicd/x/onboarding/keeper"
 	registrykeeper "git.vdb.to/cerc-io/laconicd/x/registry/keeper"
-	types "git.vdb.to/cerc-io/laconicd/x/types/v1"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -28,27 +26,19 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
 	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
-	"github.com/cosmos/cosmos-sdk/x/gov"
-	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
 	_ "cosmossdk.io/api/cosmos/tx/config/v1"            // import for side-effects
-	_ "cosmossdk.io/x/evidence"                         // import for side-effects
 	_ "git.vdb.to/cerc-io/laconicd/x/auction/module"    // import for side-effects
 	_ "git.vdb.to/cerc-io/laconicd/x/bond/module"       // import for side-effects
 	_ "git.vdb.to/cerc-io/laconicd/x/onboarding/module" // import for side-effects
@@ -59,6 +49,7 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/x/consensus"        // import for side-effects
 	_ "github.com/cosmos/cosmos-sdk/x/crisis"           // import for side-effects
 	_ "github.com/cosmos/cosmos-sdk/x/distribution"     // import for side-effects
+	_ "github.com/cosmos/cosmos-sdk/x/gov"              // import for side-effects
 	_ "github.com/cosmos/cosmos-sdk/x/mint"             // import for side-effects
 	_ "github.com/cosmos/cosmos-sdk/x/slashing"         // import for side-effects
 	_ "github.com/cosmos/cosmos-sdk/x/staking"          // import for side-effects
@@ -94,7 +85,6 @@ type LaconicApp struct {
 	GovKeeper             *govkeeper.Keeper
 	CrisisKeeper          *crisiskeeper.Keeper
 	ConsensusParamsKeeper consensuskeeper.Keeper
-	EvidenceKeeper        evidencekeeper.Keeper
 
 	// laconic keepers
 	AuctionKeeper    *auctionkeeper.Keeper // (Use * as per ProvideModule implementation)
@@ -123,11 +113,6 @@ func AppConfig() depinject.Config {
 			// supply custom module basics
 			map[string]module.AppModuleBasic{
 				genutiltypes.ModuleName: genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator),
-				govtypes.ModuleName: gov.NewAppModuleBasic(
-					[]govclient.ProposalHandler{
-						paramsclient.ProposalHandler,
-					},
-				),
 			},
 		),
 	)
@@ -168,7 +153,6 @@ func NewLaconicApp(
 		&app.GovKeeper,
 		&app.CrisisKeeper,
 		&app.ConsensusParamsKeeper,
-		&app.EvidenceKeeper,
 		&app.AuctionKeeper,
 		&app.BondKeeper,
 		&app.RegistryKeeper,
@@ -177,10 +161,6 @@ func NewLaconicApp(
 		return nil, err
 	}
 
-	// Register custom interfaces
-	RegisterCustomInterfaces(app.interfaceRegistry)
-	RegisterCustomLegacyAminoCodec(app.legacyAmino)
-
 	app.App = appBuilder.Build(db, traceStore, baseAppOptions...)
 
 	// register streaming services
@@ -197,9 +177,6 @@ func NewLaconicApp(
 	app.sm = module.NewSimulationManagerFromAppModules(app.ModuleManager.Modules, make(map[string]module.AppModuleSimulation, 0))
 	app.sm.RegisterStoreDecoders()
 
-	// set custom ante handlers
-	app.setCustomAnteHandler()
-
 	if err := app.Load(loadLatest); err != nil {
 		return nil, err
 	}
@@ -247,59 +224,3 @@ func (app *LaconicApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.AP
 		panic(err)
 	}
 }
-
-func RegisterCustomInterfaces(interfaceRegistry codectypes.InterfaceRegistry) {
-	// Custom LockupAccount type needs to be registered to be able to use it as a genesis account
-	interfaceRegistry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &types.LockupAccount{})
-
-	// LockupAccount extends auth Account
-	interfaceRegistry.RegisterInterface(
-		"cosmos.auth.v1beta1.AccountI",
-		(*sdk.AccountI)(nil),
-		&types.LockupAccount{},
-	)
-
-	// LockupAccount extends auth ModuleAccount
-	interfaceRegistry.RegisterInterface(
-		"cosmos.auth.v1beta1.ModuleAccountI",
-		(*sdk.ModuleAccountI)(nil),
-		&types.LockupAccount{},
-	)
-
-	interfaceRegistry.RegisterInterface(
-		"cosmos.auth.v1beta1.GenesisAccount",
-		(*authtypes.GenesisAccount)(nil),
-		&types.LockupAccount{},
-	)
-
-	interfaceRegistry.RegisterInterface(
-		"cerc.types.v1.LockupAccountI",
-		(*types.LockupAccountI)(nil),
-		&types.LockupAccount{},
-	)
-}
-
-func RegisterCustomLegacyAminoCodec(registrar *codec.LegacyAmino) {
-	registrar.RegisterInterface((*types.LockupAccountI)(nil), nil)
-	registrar.RegisterConcrete(&types.LockupAccount{}, "laconic/LockupAccount", nil)
-}
-
-// setCustomAnteHandler overwrites default ante handlers with custom ante handlers
-// Reference: https://github.com/cosmos/cosmos-sdk/blob/v0.50.10/x/auth/tx/config/config.go#L149
-func (app *LaconicApp) setCustomAnteHandler() {
-	anteHandler, err := ante.NewAnteHandler(
-		ante.HandlerOptions{
-			AccountKeeper:   app.AccountKeeper,
-			BankKeeper:      app.BankKeeper,
-			SignModeHandler: app.txConfig.SignModeHandler(),
-			SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
-			TxFeeChecker:    checkTxFeeWithValidatorMinGasPrices,
-		},
-	)
-	if err != nil {
-		panic(err)
-	}
-
-	// Set the AnteHandler for the app
-	app.SetAnteHandler(anteHandler)
-}

app/app.yaml

@@ -6,11 +6,11 @@ modules:
       # During begin block slashing happens after distr.BeginBlocker so that
       # there is nothing left over in the validator fee pool, so as to keep the CanWithdrawInvariant invariant.
       # NOTE: staking module is required if HistoricalEntries param > 0
-      begin_blockers: [distribution, slashing, evidence, staking]
+      begin_blockers: [distribution, slashing, staking]
       end_blockers: [crisis, gov, staking, auction, registry]
       # NOTE: The genutils module must occur after staking so that pools are properly initialized with tokens from genesis accounts.
       # NOTE: The genutils module must also occur after auth so that it can access the params from auth.
-      init_genesis: [auth, bank, distribution, staking, slashing, gov, crisis, genutil, evidence, auction, bond, registry, onboarding]
+      init_genesis: [auth, bank, distribution, staking, slashing, gov, crisis, genutil, auction, bond, registry, onboarding]
       override_store_keys:
         - module_name: auth
           kv_store_key: acc
@@ -26,14 +26,13 @@ modules:
         - account: not_bonded_tokens_pool
           permissions: [burner, staking]
         - account: gov
-          permissions: [burner]
+          permissions: [burner, staking]
         - account: auction
         - account: auction_burn
         - account: bond
         - account: registry
         - account: record_rent
         - account: authority_rent
-        - account: lps_lockup
   - name: bank
     config:
       "@type": cosmos.bank.module.v1.Module
@@ -63,9 +62,6 @@ modules:
   - name: crisis
     config:
       "@type": cosmos.crisis.module.v1.Module
-  - name: evidence
-    config:
-      "@type": cosmos.evidence.module.v1.Module
   - name: bond
     config:
       "@type": cerc.bond.module.v1.Module

app/params/config.go

@@ -10,14 +10,11 @@ import (
 )
 
 const (
-	// Registered token
+	CoinUnit     = "lnt"
-	LpsCoinUnit     = "lps"
+	BaseCoinUnit = "alnt"
-	LpsBaseCoinUnit = "alps"
+	LntExponent  = 18
-	LpsExponent     = 18
 
-	// Native token, only denominated in alnt
+	DefaultBondDenom = BaseCoinUnit
-	// Used for staking, fees and laconic module ops
-	CoinUnit = "alnt"
 
 	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address.
 	Bech32PrefixAccAddr = "laconic"
@@ -42,11 +39,12 @@ func init() {
 }
 
 func RegisterDenoms() {
-	err := sdk.RegisterDenom(LpsCoinUnit, math.LegacyOneDec())
+	err := sdk.RegisterDenom(CoinUnit, math.LegacyOneDec())
 	if err != nil {
 		panic(err)
 	}
-	err = sdk.RegisterDenom(LpsBaseCoinUnit, math.LegacyNewDecWithPrec(1, LpsExponent))
+
+	err = sdk.RegisterDenom(BaseCoinUnit, math.LegacyNewDecWithPrec(1, LntExponent))
 	if err != nil {
 		panic(err)
 	}

cmd/laconicd/cmd/add_genesis_lockup_account.go

@@ -1,154 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/spf13/cobra"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/cosmos/cosmos-sdk/x/genutil"
-	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
-
-	types "git.vdb.to/cerc-io/laconicd/x/types/v1"
-)
-
-const (
-	flagAppendMode = "append"
-)
-
-// AddGenesisLockupAccountCmd returns add-genesis-lockup-account cobra Command.
-func AddGenesisLockupAccountCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "add-genesis-lockup-account <account_name> <distribution-json-file> <coin>[,<coin>...]",
-		Short: "Add genesis lockup account with give name",
-		Args:  cobra.ExactArgs(3),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
-			serverCtx := server.GetServerContextFromCmd(cmd)
-			config := serverCtx.Config
-
-			config.SetRoot(clientCtx.HomeDir)
-
-			moduleName := args[0]
-			distributionFilePath := args[1]
-
-			var distribution []interface{}
-			distributionBytes, err := os.ReadFile(distributionFilePath)
-			if err != nil {
-				return fmt.Errorf("failed to read %s file: %w", distributionFilePath, err)
-			}
-			if err = json.Unmarshal(distributionBytes, &distribution); err != nil {
-				return fmt.Errorf("distribution is invalid json: %v", err)
-			}
-
-			appendflag, _ := cmd.Flags().GetBool(flagAppendMode)
-
-			return AddGenesisLockupAccount(clientCtx.Codec, moduleName, string(distributionBytes), appendflag, config.GenesisFile(), args[2])
-		},
-	}
-
-	cmd.Flags().Bool(flagAppendMode, false, "append the coins to an account already in the genesis.json file")
-
-	return cmd
-}
-
-func AddGenesisLockupAccount(
-	cdc codec.Codec,
-	moduleName string,
-	distribution string,
-	appendAcct bool,
-	genesisFileURL, amountStr string,
-) error {
-	coins, err := sdk.ParseCoinsNormalized(amountStr)
-	if err != nil {
-		return fmt.Errorf("failed to parse coins: %w", err)
-	}
-
-	// create concrete account type based on input parameters
-	moduleAccount := authtypes.NewEmptyModuleAccount(moduleName)
-	accAddr := moduleAccount.GetAddress()
-	balances := banktypes.Balance{Address: accAddr.String(), Coins: coins.Sort()}
-
-	genAccount := &types.LockupAccount{
-		BaseAccount:  moduleAccount.BaseAccount,
-		Name:         moduleAccount.Name,
-		Distribution: distribution,
-	}
-
-	if err := genAccount.Validate(); err != nil {
-		return fmt.Errorf("failed to validate new genesis account: %w", err)
-	}
-
-	appState, appGenesis, err := genutiltypes.GenesisStateFromGenFile(genesisFileURL)
-	if err != nil {
-		return fmt.Errorf("failed to unmarshal genesis state: %w", err)
-	}
-
-	authGenState := authtypes.GetGenesisStateFromAppState(cdc, appState)
-
-	accs, err := authtypes.UnpackAccounts(authGenState.Accounts)
-	if err != nil {
-		return fmt.Errorf("failed to get accounts from any: %w", err)
-	}
-
-	bankGenState := banktypes.GetGenesisStateFromAppState(cdc, appState)
-	if accs.Contains(accAddr) {
-		if !appendAcct {
-			return fmt.Errorf(" Account %s already exists\nUse `append` flag to append account at existing address", accAddr)
-		}
-
-		genesisB := banktypes.GetGenesisStateFromAppState(cdc, appState)
-		for idx, acc := range genesisB.Balances {
-			if acc.Address != accAddr.String() {
-				continue
-			}
-
-			updatedCoins := acc.Coins.Add(coins...)
-			bankGenState.Balances[idx] = banktypes.Balance{Address: accAddr.String(), Coins: updatedCoins.Sort()}
-			break
-		}
-	} else {
-		// Add the new account to the set of genesis accounts and sanitize the accounts afterwards.
-		accs = append(accs, genAccount)
-		accs = authtypes.SanitizeGenesisAccounts(accs)
-
-		genAccs, err := authtypes.PackAccounts(accs)
-		if err != nil {
-			return fmt.Errorf("failed to convert accounts into any's: %w", err)
-		}
-		authGenState.Accounts = genAccs
-
-		authGenStateBz, err := cdc.MarshalJSON(&authGenState)
-		if err != nil {
-			return fmt.Errorf("failed to marshal auth genesis state: %w", err)
-		}
-		appState[authtypes.ModuleName] = authGenStateBz
-
-		bankGenState.Balances = append(bankGenState.Balances, balances)
-	}
-
-	bankGenState.Balances = banktypes.SanitizeGenesisBalances(bankGenState.Balances)
-
-	bankGenState.Supply = bankGenState.Supply.Add(balances.Coins...)
-
-	bankGenStateBz, err := cdc.MarshalJSON(bankGenState)
-	if err != nil {
-		return fmt.Errorf("failed to marshal bank genesis state: %w", err)
-	}
-	appState[banktypes.ModuleName] = bankGenStateBz
-
-	appStateJSON, err := json.Marshal(appState)
-	if err != nil {
-		return fmt.Errorf("failed to marshal application genesis state: %w", err)
-	}
-
-	appGenesis.AppState = appStateJSON
-	return genutil.ExportGenesisFile(appGenesis, genesisFileURL)
-}

cmd/laconicd/cmd/commands.go

@@ -58,14 +58,10 @@ func initRootCmd(rootCmd *cobra.Command, txConfig client.TxConfig, basicManager
 		startCmd.RunE = newStartCmd.RunE
 	})
 
-	// Capture the genesis command from genutilcli and add new commands
-	genesisCmd := genutilcli.Commands(txConfig, basicManager, app.DefaultNodeHome)
-	genesisCmd.AddCommand(AddGenesisLockupAccountCmd())
-
 	// add keybase, auxiliary RPC, query, genesis, and tx child commands
 	rootCmd.AddCommand(
 		server.StatusCommand(),
-		genesisCmd,
+		genutilcli.Commands(txConfig, basicManager, app.DefaultNodeHome),
 		queryCommand(),
 		txCommand(),
 		keys.Commands(),

cmd/laconicd/cmd/root.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 	"time"
 
@@ -25,12 +24,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/cosmos/cosmos-sdk/x/auth/types"
 
 	"git.vdb.to/cerc-io/laconicd/app"
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	"git.vdb.to/cerc-io/laconicd/gql"
-	types "git.vdb.to/cerc-io/laconicd/x/types/v1"
 )
 
 const EnvPrefix = "LACONIC"
@@ -101,7 +98,7 @@ func NewRootCmd() *cobra.Command {
 
 			// overwrite the minimum gas price from the app configuration
 			srvCfg := serverconfig.DefaultConfig()
-			srvCfg.MinGasPrices = fmt.Sprintf("0%s", params.CoinUnit)
+			srvCfg.MinGasPrices = "0alnt"
 
 			// overwrite the block timeout
 			cmtCfg := cmtcfg.DefaultConfig()
@@ -136,7 +133,7 @@ func ProvideClientContext(
 		WithTxConfig(txConfig).
 		WithLegacyAmino(legacyAmino).
 		WithInput(os.Stdin).
-		WithAccountRetriever(authtypes.AccountRetriever{}).
+		WithAccountRetriever(types.AccountRetriever{}).
 		WithHomeDir(app.DefaultNodeHome).
 		WithViper(EnvPrefix) // env variable prefix
 
@@ -149,10 +146,6 @@ func ProvideClientContext(
 	clientCtx.HomeDir = ""
 	clientCtx.KeyringDir = ""
 
-	// Custom LockupAccount type needs to be registered
-	interfaceRegistry.RegisterImplementations((*types.LockupAccountI)(nil), &types.LockupAccount{})
-	interfaceRegistry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &types.LockupAccount{})
-
 	return clientCtx
 }
 

go.mod

@@ -13,24 +13,23 @@ replace (
 )
 
 require (
-	cosmossdk.io/api v0.7.5
+	cosmossdk.io/api v0.7.2
 	cosmossdk.io/client/v2 v2.0.0-beta.1
 	cosmossdk.io/collections v0.4.0
-	cosmossdk.io/core v0.11.1
+	cosmossdk.io/core v0.11.0
-	cosmossdk.io/depinject v1.0.0
+	cosmossdk.io/depinject v1.0.0-alpha.4
 	cosmossdk.io/errors v1.0.1
-	cosmossdk.io/log v1.4.1
+	cosmossdk.io/log v1.3.0
-	cosmossdk.io/math v1.3.0
+	cosmossdk.io/math v1.2.0
-	cosmossdk.io/store v1.1.1
+	cosmossdk.io/store v1.0.2
 	cosmossdk.io/tools/confix v0.1.0
-	cosmossdk.io/x/evidence v0.1.1
 	github.com/99designs/gqlgen v0.17.22
-	github.com/cometbft/cometbft v0.38.12
+	github.com/cometbft/cometbft v0.38.2
-	github.com/cosmos/cosmos-db v1.0.2
+	github.com/cosmos/cosmos-db v1.0.0
-	github.com/cosmos/cosmos-proto v1.0.0-beta.5
+	github.com/cosmos/cosmos-proto v1.0.0-beta.3
-	github.com/cosmos/cosmos-sdk v0.50.10
+	github.com/cosmos/cosmos-sdk v0.50.3
 	github.com/cosmos/go-bip39 v1.0.0
-	github.com/cosmos/gogoproto v1.7.0
+	github.com/cosmos/gogoproto v1.4.11
 	github.com/deckarep/golang-set v1.8.0
 	github.com/ethereum/go-ethereum v1.14.5
 	github.com/gibson042/canonicaljson-go v1.0.3
@@ -39,21 +38,21 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipld/go-ipld-prime v0.21.0
-	github.com/rs/cors v1.11.1
+	github.com/rs/cors v1.8.3
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.8.0
-	github.com/spf13/viper v1.19.0
+	github.com/spf13/viper v1.17.0
 	github.com/statechannels/go-nitro v0.1.2
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.8.4
 	github.com/vektah/gqlparser/v2 v2.5.11
-	golang.org/x/sync v0.8.0
+	golang.org/x/sync v0.7.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
+	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f
-	google.golang.org/grpc v1.64.1
+	google.golang.org/grpc v1.60.1
-	google.golang.org/protobuf v1.34.2
+	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	cosmossdk.io/x/tx v0.13.5 // indirect
+	cosmossdk.io/x/tx v0.13.0 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
@@ -63,24 +62,24 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/bits-and-blooms/bitset v1.10.0 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/cockroachdb/errors v1.11.3 // indirect
+	github.com/cockroachdb/errors v1.11.1 // indirect
-	github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v1.1.1 // indirect
+	github.com/cockroachdb/pebble v1.1.0 // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
-	github.com/cometbft/cometbft-db v0.11.0 // indirect
+	github.com/cometbft/cometbft-db v0.9.1 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
-	github.com/cosmos/iavl v1.2.0 // indirect
+	github.com/cosmos/iavl v1.0.0 // indirect
-	github.com/cosmos/ics23/go v0.11.0 // indirect
+	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/creachadair/atomicfile v0.3.1 // indirect
 	github.com/creachadair/tomledit v0.0.24 // indirect
@@ -92,12 +91,12 @@ require (
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
+	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
-	github.com/emicklei/dot v1.6.1 // indirect
+	github.com/emicklei/dot v1.6.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/felixge/httpsnoop v1.0.2 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/getsentry/sentry-go v0.27.0 // indirect
+	github.com/getsentry/sentry-go v0.25.0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -112,15 +111,14 @@ require (
 	github.com/google/orderedcode v0.0.1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-metrics v0.5.3 // indirect
+	github.com/hashicorp/go-metrics v0.5.1 // indirect
 	github.com/hashicorp/go-plugin v1.5.2 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
@@ -130,16 +128,18 @@ require (
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.7 // indirect
-	github.com/linxGnu/grocksdb v1.8.14 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/linxGnu/grocksdb v1.8.6 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -151,29 +151,28 @@ require (
 	github.com/multiformats/go-multibase v0.2.0 // indirect
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
 	github.com/oklog/run v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
+	github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/polydawn/refmt v0.89.0 // indirect
-	github.com/prometheus/client_golang v1.20.1 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/rs/zerolog v1.31.0 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
@@ -181,22 +180,23 @@ require (
 	github.com/tidwall/btree v1.7.0 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect
-	go.etcd.io/bbolt v1.3.10 // indirect
+	go.etcd.io/bbolt v1.3.8 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
 	pgregory.net/rapid v1.1.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace github.com/statechannels/go-nitro v0.1.2 => github.com/cerc-io/go-nitro v0.1.3-ts-port-0.1.10

gql/README.md

@@ -1,6 +1,6 @@
 # cerc-io laconic gql
 
-> Browser : <http://localhost:9473> for gql
+> Browser : http://localhost:9473 for gql
 
 ## Run gqlgen
 
@@ -13,7 +13,7 @@ On having some change in the GQL schema (for example: adding a new query) update
   go get github.com/99designs/gqlgen@v0.17.22
 
   # Generate bindings
-  cd gql
+  # In gql
   go run github.com/99designs/gqlgen generate
   ```
 

gql/cerc-io/laconicd/schema.graphql

@@ -168,14 +168,10 @@ type Auction {
   commitFee: Coin! # Fee required to bid/participate in the auction.
   revealFee: Coin! # Reveal fee (paid back to bidders only if they unseal/reveal the bid).
   minimumBid: Coin! # Minimum bid amount.
-  winnerAddresses: [String!]! # Winner address.
+  winnerAddress: String! # Winner address.
-  winnerBids: [Coin!]! # The winning bid amount.
+  winnerBid: Coin! # The winning bid amount.
   winnerPrice: Coin! # The price that the winner actually pays (2nd highest bid).
-  maxPrice: Coin! # Max bid amount for service provider auction.
+  bids: [AuctionBid] # Bids make in the auction.
-  kind: String! # Auction kind.
-  numProviders: Int # Number of service providers
-  fundsReleased: Boolean! # Whether funds have been released to providers
-  bids: [AuctionBid!]! # Bids made in the auction.
 }
 
 # Record defines the basic properties of an entity in the graph database.
@@ -231,7 +227,7 @@ type Query {
   getBondsByIds(ids: [String!]): [Bond]
 
   # Query bonds.
-  queryBonds: [Bond]
+  queryBonds(attributes: [KeyValueInput!]): [Bond]
 
   # Query bonds by owner.
   queryBondsByOwner(ownerAddresses: [String!]): [OwnerBonds]
@@ -250,12 +246,6 @@ type Query {
 
     # Whether to query all records, not just named ones (false by default).
     all: Boolean
-
-    # Pagination limit
-    limit: Int
-
-    # Pagination offset
-    offset: Int
   ): [Record]
 
   #
@@ -263,7 +253,7 @@ type Query {
   #
 
   # Get authorities list.
-  getAuthorities(owner: String): [Authority]!
+  getAuthorities(owner: String): [Authority]
 
   # Lookup authority information.
   lookupAuthorities(names: [String!]): [AuthorityRecord]!

gql/generated.go

@@ -65,18 +65,14 @@ type ComplexityRoot struct {
 		CommitFee      func(childComplexity int) int
 		CommitsEndTime func(childComplexity int) int
 		CreateTime     func(childComplexity int) int
-		FundsReleased   func(childComplexity int) int
 		ID             func(childComplexity int) int
-		Kind            func(childComplexity int) int
-		MaxPrice        func(childComplexity int) int
 		MinimumBid     func(childComplexity int) int
-		NumProviders    func(childComplexity int) int
 		OwnerAddress   func(childComplexity int) int
 		RevealFee      func(childComplexity int) int
 		RevealsEndTime func(childComplexity int) int
 		Status         func(childComplexity int) int
-		WinnerAddresses func(childComplexity int) int
+		WinnerAddress  func(childComplexity int) int
-		WinnerBids      func(childComplexity int) int
+		WinnerBid      func(childComplexity int) int
 		WinnerPrice    func(childComplexity int) int
 	}
 
@@ -187,9 +183,9 @@ type ComplexityRoot struct {
 		GetStatus                    func(childComplexity int) int
 		LookupAuthorities            func(childComplexity int, names []string) int
 		LookupNames                  func(childComplexity int, names []string) int
-		QueryBonds                   func(childComplexity int) int
+		QueryBonds                   func(childComplexity int, attributes []*KeyValueInput) int
 		QueryBondsByOwner            func(childComplexity int, ownerAddresses []string) int
-		QueryRecords                 func(childComplexity int, attributes []*KeyValueInput, all *bool, limit *int, offset *int) int
+		QueryRecords                 func(childComplexity int, attributes []*KeyValueInput, all *bool) int
 		ResolveNames                 func(childComplexity int, names []string) int
 	}
 
@@ -237,10 +233,10 @@ type QueryResolver interface {
 	GetStatus(ctx context.Context) (*Status, error)
 	GetAccounts(ctx context.Context, addresses []string) ([]*Account, error)
 	GetBondsByIds(ctx context.Context, ids []string) ([]*Bond, error)
-	QueryBonds(ctx context.Context) ([]*Bond, error)
+	QueryBonds(ctx context.Context, attributes []*KeyValueInput) ([]*Bond, error)
 	QueryBondsByOwner(ctx context.Context, ownerAddresses []string) ([]*OwnerBonds, error)
 	GetRecordsByIds(ctx context.Context, ids []string) ([]*Record, error)
-	QueryRecords(ctx context.Context, attributes []*KeyValueInput, all *bool, limit *int, offset *int) ([]*Record, error)
+	QueryRecords(ctx context.Context, attributes []*KeyValueInput, all *bool) ([]*Record, error)
 	GetAuthorities(ctx context.Context, owner *string) ([]*Authority, error)
 	LookupAuthorities(ctx context.Context, names []string) ([]*AuthorityRecord, error)
 	LookupNames(ctx context.Context, names []string) ([]*NameRecord, error)
@@ -350,13 +346,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Auction.CreateTime(childComplexity), true
 
-	case "Auction.fundsReleased":
-		if e.complexity.Auction.FundsReleased == nil {
-			break
-		}
-
-		return e.complexity.Auction.FundsReleased(childComplexity), true
-
 	case "Auction.id":
 		if e.complexity.Auction.ID == nil {
 			break
@@ -364,20 +353,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Auction.ID(childComplexity), true
 
-	case "Auction.kind":
-		if e.complexity.Auction.Kind == nil {
-			break
-		}
-
-		return e.complexity.Auction.Kind(childComplexity), true
-
-	case "Auction.maxPrice":
-		if e.complexity.Auction.MaxPrice == nil {
-			break
-		}
-
-		return e.complexity.Auction.MaxPrice(childComplexity), true
-
 	case "Auction.minimumBid":
 		if e.complexity.Auction.MinimumBid == nil {
 			break
@@ -385,13 +360,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Auction.MinimumBid(childComplexity), true
 
-	case "Auction.numProviders":
-		if e.complexity.Auction.NumProviders == nil {
-			break
-		}
-
-		return e.complexity.Auction.NumProviders(childComplexity), true
-
 	case "Auction.ownerAddress":
 		if e.complexity.Auction.OwnerAddress == nil {
 			break
@@ -420,19 +388,19 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Auction.Status(childComplexity), true
 
-	case "Auction.winnerAddresses":
+	case "Auction.winnerAddress":
-		if e.complexity.Auction.WinnerAddresses == nil {
+		if e.complexity.Auction.WinnerAddress == nil {
 			break
 		}
 
-		return e.complexity.Auction.WinnerAddresses(childComplexity), true
+		return e.complexity.Auction.WinnerAddress(childComplexity), true
 
-	case "Auction.winnerBids":
+	case "Auction.winnerBid":
-		if e.complexity.Auction.WinnerBids == nil {
+		if e.complexity.Auction.WinnerBid == nil {
 			break
 		}
 
-		return e.complexity.Auction.WinnerBids(childComplexity), true
+		return e.complexity.Auction.WinnerBid(childComplexity), true
 
 	case "Auction.winnerPrice":
 		if e.complexity.Auction.WinnerPrice == nil {
@@ -876,7 +844,12 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			break
 		}
 
-		return e.complexity.Query.QueryBonds(childComplexity), true
+		args, err := ec.field_Query_queryBonds_args(context.TODO(), rawArgs)
+		if err != nil {
+			return 0, false
+		}
+
+		return e.complexity.Query.QueryBonds(childComplexity, args["attributes"].([]*KeyValueInput)), true
 
 	case "Query.queryBondsByOwner":
 		if e.complexity.Query.QueryBondsByOwner == nil {
@@ -900,7 +873,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.QueryRecords(childComplexity, args["attributes"].([]*KeyValueInput), args["all"].(*bool), args["limit"].(*int), args["offset"].(*int)), true
+		return e.complexity.Query.QueryRecords(childComplexity, args["attributes"].([]*KeyValueInput), args["all"].(*bool)), true
 
 	case "Query.resolveNames":
 		if e.complexity.Query.ResolveNames == nil {
@@ -1321,6 +1294,21 @@ func (ec *executionContext) field_Query_queryBondsByOwner_args(ctx context.Conte
 	return args, nil
 }
 
+func (ec *executionContext) field_Query_queryBonds_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
+	var err error
+	args := map[string]interface{}{}
+	var arg0 []*KeyValueInput
+	if tmp, ok := rawArgs["attributes"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("attributes"))
+		arg0, err = ec.unmarshalOKeyValueInput2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐKeyValueInputᚄ(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["attributes"] = arg0
+	return args, nil
+}
+
 func (ec *executionContext) field_Query_queryRecords_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
 	var err error
 	args := map[string]interface{}{}
@@ -1342,24 +1330,6 @@ func (ec *executionContext) field_Query_queryRecords_args(ctx context.Context, r
 		}
 	}
 	args["all"] = arg1
-	var arg2 *int
-	if tmp, ok := rawArgs["limit"]; ok {
-		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("limit"))
-		arg2, err = ec.unmarshalOInt2ᚖint(ctx, tmp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	args["limit"] = arg2
-	var arg3 *int
-	if tmp, ok := rawArgs["offset"]; ok {
-		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("offset"))
-		arg3, err = ec.unmarshalOInt2ᚖint(ctx, tmp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	args["offset"] = arg3
 	return args, nil
 }
 
@@ -2179,8 +2149,8 @@ func (ec *executionContext) fieldContext_Auction_minimumBid(ctx context.Context,
 	return fc, nil
 }
 
-func (ec *executionContext) _Auction_winnerAddresses(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
+func (ec *executionContext) _Auction_winnerAddress(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_winnerAddresses(ctx, field)
+	fc, err := ec.fieldContext_Auction_winnerAddress(ctx, field)
 	if err != nil {
 		return graphql.Null
 	}
@@ -2193,7 +2163,7 @@ func (ec *executionContext) _Auction_winnerAddresses(ctx context.Context, field
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return obj.WinnerAddresses, nil
+		return obj.WinnerAddress, nil
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -2205,12 +2175,12 @@ func (ec *executionContext) _Auction_winnerAddresses(ctx context.Context, field
 		}
 		return graphql.Null
 	}
-	res := resTmp.([]string)
+	res := resTmp.(string)
 	fc.Result = res
-	return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res)
+	return ec.marshalNString2string(ctx, field.Selections, res)
 }
 
-func (ec *executionContext) fieldContext_Auction_winnerAddresses(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) fieldContext_Auction_winnerAddress(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "Auction",
 		Field:      field,
@@ -2223,8 +2193,8 @@ func (ec *executionContext) fieldContext_Auction_winnerAddresses(ctx context.Con
 	return fc, nil
 }
 
-func (ec *executionContext) _Auction_winnerBids(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
+func (ec *executionContext) _Auction_winnerBid(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_winnerBids(ctx, field)
+	fc, err := ec.fieldContext_Auction_winnerBid(ctx, field)
 	if err != nil {
 		return graphql.Null
 	}
@@ -2237,7 +2207,7 @@ func (ec *executionContext) _Auction_winnerBids(ctx context.Context, field graph
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return obj.WinnerBids, nil
+		return obj.WinnerBid, nil
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -2249,12 +2219,12 @@ func (ec *executionContext) _Auction_winnerBids(ctx context.Context, field graph
 		}
 		return graphql.Null
 	}
-	res := resTmp.([]*Coin)
+	res := resTmp.(*Coin)
 	fc.Result = res
-	return ec.marshalNCoin2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoinᚄ(ctx, field.Selections, res)
+	return ec.marshalNCoin2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoin(ctx, field.Selections, res)
 }
 
-func (ec *executionContext) fieldContext_Auction_winnerBids(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) fieldContext_Auction_winnerBid(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "Auction",
 		Field:      field,
@@ -2323,185 +2293,6 @@ func (ec *executionContext) fieldContext_Auction_winnerPrice(ctx context.Context
 	return fc, nil
 }
 
-func (ec *executionContext) _Auction_maxPrice(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_maxPrice(ctx, field)
-	if err != nil {
-		return graphql.Null
-	}
-	ctx = graphql.WithFieldContext(ctx, fc)
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = graphql.Null
-		}
-	}()
-	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
-		ctx = rctx // use context from middleware stack in children
-		return obj.MaxPrice, nil
-	})
-	if err != nil {
-		ec.Error(ctx, err)
-		return graphql.Null
-	}
-	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
-		return graphql.Null
-	}
-	res := resTmp.(*Coin)
-	fc.Result = res
-	return ec.marshalNCoin2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoin(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Auction_maxPrice(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
-	fc = &graphql.FieldContext{
-		Object:     "Auction",
-		Field:      field,
-		IsMethod:   false,
-		IsResolver: false,
-		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			switch field.Name {
-			case "type":
-				return ec.fieldContext_Coin_type(ctx, field)
-			case "quantity":
-				return ec.fieldContext_Coin_quantity(ctx, field)
-			}
-			return nil, fmt.Errorf("no field named %q was found under type Coin", field.Name)
-		},
-	}
-	return fc, nil
-}
-
-func (ec *executionContext) _Auction_kind(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_kind(ctx, field)
-	if err != nil {
-		return graphql.Null
-	}
-	ctx = graphql.WithFieldContext(ctx, fc)
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = graphql.Null
-		}
-	}()
-	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
-		ctx = rctx // use context from middleware stack in children
-		return obj.Kind, nil
-	})
-	if err != nil {
-		ec.Error(ctx, err)
-		return graphql.Null
-	}
-	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
-		return graphql.Null
-	}
-	res := resTmp.(string)
-	fc.Result = res
-	return ec.marshalNString2string(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Auction_kind(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
-	fc = &graphql.FieldContext{
-		Object:     "Auction",
-		Field:      field,
-		IsMethod:   false,
-		IsResolver: false,
-		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			return nil, errors.New("field of type String does not have child fields")
-		},
-	}
-	return fc, nil
-}
-
-func (ec *executionContext) _Auction_numProviders(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_numProviders(ctx, field)
-	if err != nil {
-		return graphql.Null
-	}
-	ctx = graphql.WithFieldContext(ctx, fc)
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = graphql.Null
-		}
-	}()
-	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
-		ctx = rctx // use context from middleware stack in children
-		return obj.NumProviders, nil
-	})
-	if err != nil {
-		ec.Error(ctx, err)
-		return graphql.Null
-	}
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.(*int)
-	fc.Result = res
-	return ec.marshalOInt2ᚖint(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Auction_numProviders(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
-	fc = &graphql.FieldContext{
-		Object:     "Auction",
-		Field:      field,
-		IsMethod:   false,
-		IsResolver: false,
-		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			return nil, errors.New("field of type Int does not have child fields")
-		},
-	}
-	return fc, nil
-}
-
-func (ec *executionContext) _Auction_fundsReleased(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Auction_fundsReleased(ctx, field)
-	if err != nil {
-		return graphql.Null
-	}
-	ctx = graphql.WithFieldContext(ctx, fc)
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = graphql.Null
-		}
-	}()
-	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
-		ctx = rctx // use context from middleware stack in children
-		return obj.FundsReleased, nil
-	})
-	if err != nil {
-		ec.Error(ctx, err)
-		return graphql.Null
-	}
-	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
-		return graphql.Null
-	}
-	res := resTmp.(bool)
-	fc.Result = res
-	return ec.marshalNBoolean2bool(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Auction_fundsReleased(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
-	fc = &graphql.FieldContext{
-		Object:     "Auction",
-		Field:      field,
-		IsMethod:   false,
-		IsResolver: false,
-		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			return nil, errors.New("field of type Boolean does not have child fields")
-		},
-	}
-	return fc, nil
-}
-
 func (ec *executionContext) _Auction_bids(ctx context.Context, field graphql.CollectedField, obj *Auction) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Auction_bids(ctx, field)
 	if err != nil {
@@ -2523,14 +2314,11 @@ func (ec *executionContext) _Auction_bids(ctx context.Context, field graphql.Col
 		return graphql.Null
 	}
 	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]*AuctionBid)
 	fc.Result = res
-	return ec.marshalNAuctionBid2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBidᚄ(ctx, field.Selections, res)
+	return ec.marshalOAuctionBid2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) fieldContext_Auction_bids(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
@@ -3356,20 +3144,12 @@ func (ec *executionContext) fieldContext_AuthorityRecord_auction(ctx context.Con
 				return ec.fieldContext_Auction_revealFee(ctx, field)
 			case "minimumBid":
 				return ec.fieldContext_Auction_minimumBid(ctx, field)
-			case "winnerAddresses":
+			case "winnerAddress":
-				return ec.fieldContext_Auction_winnerAddresses(ctx, field)
+				return ec.fieldContext_Auction_winnerAddress(ctx, field)
-			case "winnerBids":
+			case "winnerBid":
-				return ec.fieldContext_Auction_winnerBids(ctx, field)
+				return ec.fieldContext_Auction_winnerBid(ctx, field)
 			case "winnerPrice":
 				return ec.fieldContext_Auction_winnerPrice(ctx, field)
-			case "maxPrice":
-				return ec.fieldContext_Auction_maxPrice(ctx, field)
-			case "kind":
-				return ec.fieldContext_Auction_kind(ctx, field)
-			case "numProviders":
-				return ec.fieldContext_Auction_numProviders(ctx, field)
-			case "fundsReleased":
-				return ec.fieldContext_Auction_fundsReleased(ctx, field)
 			case "bids":
 				return ec.fieldContext_Auction_bids(ctx, field)
 			}
@@ -4798,7 +4578,7 @@ func (ec *executionContext) _Query_queryBonds(ctx context.Context, field graphql
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().QueryBonds(rctx)
+		return ec.resolvers.Query().QueryBonds(rctx, fc.Args["attributes"].([]*KeyValueInput))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -4830,6 +4610,17 @@ func (ec *executionContext) fieldContext_Query_queryBonds(ctx context.Context, f
 			return nil, fmt.Errorf("no field named %q was found under type Bond", field.Name)
 		},
 	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = ec.Recover(ctx, r)
+			ec.Error(ctx, err)
+		}
+	}()
+	ctx = graphql.WithFieldContext(ctx, fc)
+	if fc.Args, err = ec.field_Query_queryBonds_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+		ec.Error(ctx, err)
+		return
+	}
 	return fc, nil
 }
 
@@ -4975,7 +4766,7 @@ func (ec *executionContext) _Query_queryRecords(ctx context.Context, field graph
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().QueryRecords(rctx, fc.Args["attributes"].([]*KeyValueInput), fc.Args["all"].(*bool), fc.Args["limit"].(*int), fc.Args["offset"].(*int))
+		return ec.resolvers.Query().QueryRecords(rctx, fc.Args["attributes"].([]*KeyValueInput), fc.Args["all"].(*bool))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -5052,14 +4843,11 @@ func (ec *executionContext) _Query_getAuthorities(ctx context.Context, field gra
 		return graphql.Null
 	}
 	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]*Authority)
 	fc.Result = res
-	return ec.marshalNAuthority2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx, field.Selections, res)
+	return ec.marshalOAuthority2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) fieldContext_Query_getAuthorities(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
@@ -5351,20 +5139,12 @@ func (ec *executionContext) fieldContext_Query_getAuctionsByIds(ctx context.Cont
 				return ec.fieldContext_Auction_revealFee(ctx, field)
 			case "minimumBid":
 				return ec.fieldContext_Auction_minimumBid(ctx, field)
-			case "winnerAddresses":
+			case "winnerAddress":
-				return ec.fieldContext_Auction_winnerAddresses(ctx, field)
+				return ec.fieldContext_Auction_winnerAddress(ctx, field)
-			case "winnerBids":
+			case "winnerBid":
-				return ec.fieldContext_Auction_winnerBids(ctx, field)
+				return ec.fieldContext_Auction_winnerBid(ctx, field)
 			case "winnerPrice":
 				return ec.fieldContext_Auction_winnerPrice(ctx, field)
-			case "maxPrice":
-				return ec.fieldContext_Auction_maxPrice(ctx, field)
-			case "kind":
-				return ec.fieldContext_Auction_kind(ctx, field)
-			case "numProviders":
-				return ec.fieldContext_Auction_numProviders(ctx, field)
-			case "fundsReleased":
-				return ec.fieldContext_Auction_fundsReleased(ctx, field)
 			case "bids":
 				return ec.fieldContext_Auction_bids(ctx, field)
 			}
@@ -8940,16 +8720,16 @@ func (ec *executionContext) _Auction(ctx context.Context, sel ast.SelectionSet,
 			if out.Values[i] == graphql.Null {
 				invalids++
 			}
-		case "winnerAddresses":
+		case "winnerAddress":
 
-			out.Values[i] = ec._Auction_winnerAddresses(ctx, field, obj)
+			out.Values[i] = ec._Auction_winnerAddress(ctx, field, obj)
 
 			if out.Values[i] == graphql.Null {
 				invalids++
 			}
-		case "winnerBids":
+		case "winnerBid":
 
-			out.Values[i] = ec._Auction_winnerBids(ctx, field, obj)
+			out.Values[i] = ec._Auction_winnerBid(ctx, field, obj)
 
 			if out.Values[i] == graphql.Null {
 				invalids++
@@ -8958,31 +8738,6 @@ func (ec *executionContext) _Auction(ctx context.Context, sel ast.SelectionSet,
 
 			out.Values[i] = ec._Auction_winnerPrice(ctx, field, obj)
 
-			if out.Values[i] == graphql.Null {
-				invalids++
-			}
-		case "maxPrice":
-
-			out.Values[i] = ec._Auction_maxPrice(ctx, field, obj)
-
-			if out.Values[i] == graphql.Null {
-				invalids++
-			}
-		case "kind":
-
-			out.Values[i] = ec._Auction_kind(ctx, field, obj)
-
-			if out.Values[i] == graphql.Null {
-				invalids++
-			}
-		case "numProviders":
-
-			out.Values[i] = ec._Auction_numProviders(ctx, field, obj)
-
-		case "fundsReleased":
-
-			out.Values[i] = ec._Auction_fundsReleased(ctx, field, obj)
-
 			if out.Values[i] == graphql.Null {
 				invalids++
 			}
@@ -8990,9 +8745,6 @@ func (ec *executionContext) _Auction(ctx context.Context, sel ast.SelectionSet,
 
 			out.Values[i] = ec._Auction_bids(ctx, field, obj)
 
-			if out.Values[i] == graphql.Null {
-				invalids++
-			}
 		default:
 			panic("unknown field " + strconv.Quote(field.Name))
 		}
@@ -9829,9 +9581,6 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
 					}
 				}()
 				res = ec._Query_getAuthorities(ctx, field)
-				if res == graphql.Null {
-					atomic.AddUint32(&invalids, 1)
-				}
 				return res
 			}
 
@@ -10647,98 +10396,6 @@ func (ec *executionContext) marshalNAttribute2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋla
 	return ec._Attribute(ctx, sel, v)
 }
 
-func (ec *executionContext) marshalNAuctionBid2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBidᚄ(ctx context.Context, sel ast.SelectionSet, v []*AuctionBid) graphql.Marshaler {
-	ret := make(graphql.Array, len(v))
-	var wg sync.WaitGroup
-	isLen1 := len(v) == 1
-	if !isLen1 {
-		wg.Add(len(v))
-	}
-	for i := range v {
-		i := i
-		fc := &graphql.FieldContext{
-			Index:  &i,
-			Result: &v[i],
-		}
-		ctx := graphql.WithFieldContext(ctx, fc)
-		f := func(i int) {
-			defer func() {
-				if r := recover(); r != nil {
-					ec.Error(ctx, ec.Recover(ctx, r))
-					ret = nil
-				}
-			}()
-			if !isLen1 {
-				defer wg.Done()
-			}
-			ret[i] = ec.marshalNAuctionBid2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx, sel, v[i])
-		}
-		if isLen1 {
-			f(i)
-		} else {
-			go f(i)
-		}
-
-	}
-	wg.Wait()
-
-	for _, e := range ret {
-		if e == graphql.Null {
-			return graphql.Null
-		}
-	}
-
-	return ret
-}
-
-func (ec *executionContext) marshalNAuctionBid2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx context.Context, sel ast.SelectionSet, v *AuctionBid) graphql.Marshaler {
-	if v == nil {
-		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
-			ec.Errorf(ctx, "the requested element is null which the schema does not allow")
-		}
-		return graphql.Null
-	}
-	return ec._AuctionBid(ctx, sel, v)
-}
-
-func (ec *executionContext) marshalNAuthority2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx context.Context, sel ast.SelectionSet, v []*Authority) graphql.Marshaler {
-	ret := make(graphql.Array, len(v))
-	var wg sync.WaitGroup
-	isLen1 := len(v) == 1
-	if !isLen1 {
-		wg.Add(len(v))
-	}
-	for i := range v {
-		i := i
-		fc := &graphql.FieldContext{
-			Index:  &i,
-			Result: &v[i],
-		}
-		ctx := graphql.WithFieldContext(ctx, fc)
-		f := func(i int) {
-			defer func() {
-				if r := recover(); r != nil {
-					ec.Error(ctx, ec.Recover(ctx, r))
-					ret = nil
-				}
-			}()
-			if !isLen1 {
-				defer wg.Done()
-			}
-			ret[i] = ec.marshalOAuthority2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx, sel, v[i])
-		}
-		if isLen1 {
-			f(i)
-		} else {
-			go f(i)
-		}
-
-	}
-	wg.Wait()
-
-	return ret
-}
-
 func (ec *executionContext) marshalNAuthorityRecord2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthorityRecord(ctx context.Context, sel ast.SelectionSet, v []*AuthorityRecord) graphql.Marshaler {
 	ret := make(graphql.Array, len(v))
 	var wg sync.WaitGroup
@@ -10812,50 +10469,6 @@ func (ec *executionContext) marshalNBoolean2bool(ctx context.Context, sel ast.Se
 	return res
 }
 
-func (ec *executionContext) marshalNCoin2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoinᚄ(ctx context.Context, sel ast.SelectionSet, v []*Coin) graphql.Marshaler {
-	ret := make(graphql.Array, len(v))
-	var wg sync.WaitGroup
-	isLen1 := len(v) == 1
-	if !isLen1 {
-		wg.Add(len(v))
-	}
-	for i := range v {
-		i := i
-		fc := &graphql.FieldContext{
-			Index:  &i,
-			Result: &v[i],
-		}
-		ctx := graphql.WithFieldContext(ctx, fc)
-		f := func(i int) {
-			defer func() {
-				if r := recover(); r != nil {
-					ec.Error(ctx, ec.Recover(ctx, r))
-					ret = nil
-				}
-			}()
-			if !isLen1 {
-				defer wg.Done()
-			}
-			ret[i] = ec.marshalNCoin2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoin(ctx, sel, v[i])
-		}
-		if isLen1 {
-			f(i)
-		} else {
-			go f(i)
-		}
-
-	}
-	wg.Wait()
-
-	for _, e := range ret {
-		if e == graphql.Null {
-			return graphql.Null
-		}
-	}
-
-	return ret
-}
-
 func (ec *executionContext) marshalNCoin2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐCoin(ctx context.Context, sel ast.SelectionSet, v *Coin) graphql.Marshaler {
 	if v == nil {
 		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
@@ -11088,38 +10701,6 @@ func (ec *executionContext) marshalNString2string(ctx context.Context, sel ast.S
 	return res
 }
 
-func (ec *executionContext) unmarshalNString2ᚕstringᚄ(ctx context.Context, v interface{}) ([]string, error) {
-	var vSlice []interface{}
-	if v != nil {
-		vSlice = graphql.CoerceList(v)
-	}
-	var err error
-	res := make([]string, len(vSlice))
-	for i := range vSlice {
-		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i))
-		res[i], err = ec.unmarshalNString2string(ctx, vSlice[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-	return res, nil
-}
-
-func (ec *executionContext) marshalNString2ᚕstringᚄ(ctx context.Context, sel ast.SelectionSet, v []string) graphql.Marshaler {
-	ret := make(graphql.Array, len(v))
-	for i := range v {
-		ret[i] = ec.marshalNString2string(ctx, sel, v[i])
-	}
-
-	for _, e := range ret {
-		if e == graphql.Null {
-			return graphql.Null
-		}
-	}
-
-	return ret
-}
-
 func (ec *executionContext) marshalNSyncInfo2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐSyncInfo(ctx context.Context, sel ast.SelectionSet, v *SyncInfo) graphql.Marshaler {
 	if v == nil {
 		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
@@ -11602,6 +11183,95 @@ func (ec *executionContext) marshalOAuction2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaco
 	return ec._Auction(ctx, sel, v)
 }
 
+func (ec *executionContext) marshalOAuctionBid2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx context.Context, sel ast.SelectionSet, v []*AuctionBid) graphql.Marshaler {
+	if v == nil {
+		return graphql.Null
+	}
+	ret := make(graphql.Array, len(v))
+	var wg sync.WaitGroup
+	isLen1 := len(v) == 1
+	if !isLen1 {
+		wg.Add(len(v))
+	}
+	for i := range v {
+		i := i
+		fc := &graphql.FieldContext{
+			Index:  &i,
+			Result: &v[i],
+		}
+		ctx := graphql.WithFieldContext(ctx, fc)
+		f := func(i int) {
+			defer func() {
+				if r := recover(); r != nil {
+					ec.Error(ctx, ec.Recover(ctx, r))
+					ret = nil
+				}
+			}()
+			if !isLen1 {
+				defer wg.Done()
+			}
+			ret[i] = ec.marshalOAuctionBid2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx, sel, v[i])
+		}
+		if isLen1 {
+			f(i)
+		} else {
+			go f(i)
+		}
+
+	}
+	wg.Wait()
+
+	return ret
+}
+
+func (ec *executionContext) marshalOAuctionBid2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuctionBid(ctx context.Context, sel ast.SelectionSet, v *AuctionBid) graphql.Marshaler {
+	if v == nil {
+		return graphql.Null
+	}
+	return ec._AuctionBid(ctx, sel, v)
+}
+
+func (ec *executionContext) marshalOAuthority2ᚕᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx context.Context, sel ast.SelectionSet, v []*Authority) graphql.Marshaler {
+	if v == nil {
+		return graphql.Null
+	}
+	ret := make(graphql.Array, len(v))
+	var wg sync.WaitGroup
+	isLen1 := len(v) == 1
+	if !isLen1 {
+		wg.Add(len(v))
+	}
+	for i := range v {
+		i := i
+		fc := &graphql.FieldContext{
+			Index:  &i,
+			Result: &v[i],
+		}
+		ctx := graphql.WithFieldContext(ctx, fc)
+		f := func(i int) {
+			defer func() {
+				if r := recover(); r != nil {
+					ec.Error(ctx, ec.Recover(ctx, r))
+					ret = nil
+				}
+			}()
+			if !isLen1 {
+				defer wg.Done()
+			}
+			ret[i] = ec.marshalOAuthority2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx, sel, v[i])
+		}
+		if isLen1 {
+			f(i)
+		} else {
+			go f(i)
+		}
+
+	}
+	wg.Wait()
+
+	return ret
+}
+
 func (ec *executionContext) marshalOAuthority2ᚖgitᚗvdbᚗtoᚋcercᚑioᚋlaconicdᚋgqlᚐAuthority(ctx context.Context, sel ast.SelectionSet, v *Authority) graphql.Marshaler {
 	if v == nil {
 		return graphql.Null

gql/graphiql.go

@@ -26,7 +26,7 @@ func PlaygroundHandler(apiURL string) http.HandlerFunc {
 	}
 }
 
-// https://github.com/graphql/graphiql/blob/graphiql%402.4.7/examples/graphiql-cdn/index.html
+// https://github.com/graphql/graphiql/blob/main/examples/graphiql-cdn/index.html
 var page = template.Must(template.New("graphiql").Parse(`
 <!DOCTYPE html>
 <html lang="en">
@@ -68,17 +68,17 @@ var page = template.Must(template.New("graphiql").Parse(`
       copy them directly into your environment, or perhaps include them in your
       favored resource bundler.
      -->
-    <link rel="stylesheet" href="https://unpkg.com/graphiql@2.4.7/graphiql.min.css" />
+    <link rel="stylesheet" href="https://unpkg.com/graphiql/graphiql.min.css" />
   </head>
 
   <body>
     <div id="graphiql">Loading...</div>
     <script
-      src="https://unpkg.com/graphiql@2.4.7/graphiql.min.js"
+      src="https://unpkg.com/graphiql/graphiql.min.js"
       type="application/javascript"
     ></script>
     <script>
-      // https://github.com/graphql/graphiql/blob/graphiql%402.4.7/packages/graphiql/resources/renderExample.js
+      // https://github.com/graphql/graphiql/blob/main/packages/graphiql/resources/renderExample.js
       
       // Parse the search string to get url parameters.
       var search = window.location.search;

gql/models_gen.go

@@ -35,13 +35,9 @@ type Auction struct {
 	CommitFee      *Coin         `json:"commitFee"`
 	RevealFee      *Coin         `json:"revealFee"`
 	MinimumBid     *Coin         `json:"minimumBid"`
-	WinnerAddresses []string      `json:"winnerAddresses"`
+	WinnerAddress  string        `json:"winnerAddress"`
-	WinnerBids      []*Coin       `json:"winnerBids"`
+	WinnerBid      *Coin         `json:"winnerBid"`
 	WinnerPrice    *Coin         `json:"winnerPrice"`
-	MaxPrice        *Coin         `json:"maxPrice"`
-	Kind            string        `json:"kind"`
-	NumProviders    *int          `json:"numProviders"`
-	FundsReleased   bool          `json:"fundsReleased"`
 	Bids           []*AuctionBid `json:"bids"`
 }
 

gql/resolver.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	types "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/query"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
@@ -24,9 +23,6 @@ const DefaultLogNumLines = 50
 // MaxLogNumLines is the max number of log lines that can be tailed.
 const MaxLogNumLines = 1000
 
-// Whether to use default page limit when pagination args are not passed.
-const UseDefaultPagination = false
-
 type Resolver struct {
 	ctx     client.Context
 	logFile string
@@ -140,34 +136,14 @@ func (q queryResolver) LookupNames(ctx context.Context, names []string) ([]*Name
 	return gqlResponse, nil
 }
 
-func (q queryResolver) QueryRecords(ctx context.Context, attributes []*KeyValueInput, all *bool, limit *int, offset *int) ([]*Record, error) {
+func (q queryResolver) QueryRecords(ctx context.Context, attributes []*KeyValueInput, all *bool) ([]*Record, error) {
 	nsQueryClient := registrytypes.NewQueryClient(q.ctx)
 
-	var pagination *query.PageRequest
-
-	// Use defaults only if limit and offset not provided
-	// and UseDefaultPagination is true
-	if limit == nil && offset == nil {
-		if UseDefaultPagination {
-			pagination = &query.PageRequest{}
-		}
-	} else {
-		pagination = &query.PageRequest{}
-
-		if limit != nil {
-			pagination.Limit = uint64(*limit)
-		}
-		if offset != nil {
-			pagination.Offset = uint64(*offset)
-		}
-	}
-
 	res, err := nsQueryClient.Records(
 		context.Background(),
 		&registrytypes.QueryRecordsRequest{
 			Attributes: toRPCAttributes(attributes),
 			All:        (all != nil && *all),
-			Pagination: pagination,
 		},
 	)
 	if err != nil {
@@ -320,7 +296,7 @@ func (q *queryResolver) GetBond(ctx context.Context, id string) (*Bond, error) {
 	return getGQLBond(bondResp.GetBond())
 }
 
-func (q queryResolver) QueryBonds(ctx context.Context) ([]*Bond, error) {
+func (q queryResolver) QueryBonds(ctx context.Context, attributes []*KeyValueInput) ([]*Bond, error) {
 	bondQueryClient := bondtypes.NewQueryClient(q.ctx)
 	bonds, err := bondQueryClient.Bonds(context.Background(), &bondtypes.QueryBondsRequest{})
 	if err != nil {

gql/util.go

@@ -232,8 +232,6 @@ func GetGQLAuction(auction *auctiontypes.Auction, bids []*auctiontypes.Bid) (*Au
 		return nil, nil
 	}
 
-	numProviders := int(auction.NumProviders)
-
 	gqlAuction := Auction{
 		ID:             auction.Id,
 		Status:         auction.Status,
@@ -244,13 +242,9 @@ func GetGQLAuction(auction *auctiontypes.Auction, bids []*auctiontypes.Bid) (*Au
 		CommitFee:      getGQLCoin(auction.CommitFee),
 		RevealFee:      getGQLCoin(auction.RevealFee),
 		MinimumBid:     getGQLCoin(auction.MinimumBid),
-		WinnerAddresses: auction.WinnerAddresses,
+		WinnerAddress:  auction.WinnerAddress,
-		WinnerBids:      getGQLCoins(auction.WinningBids),
+		WinnerBid:      getGQLCoin(auction.WinningBid),
 		WinnerPrice:    getGQLCoin(auction.WinningPrice),
-		MaxPrice:        getGQLCoin(auction.MaxPrice),
-		Kind:            auction.Kind,
-		NumProviders:    &numProviders,
-		FundsReleased:   auction.FundsReleased,
 	}
 
 	auctionBids := make([]*AuctionBid, len(bids))

lockup.md

@@ -1,47 +0,0 @@
-# Lockup Account Usage
-
-* Add a genesis lockup account:
-
-  ```bash
-  laconicd genesis add-genesis-lockup-account <account_name> <distribution-json-file> <coin>[,<coin>...]
-
-  # Example
-  # laconicd genesis add-genesis-lockup-account lps_lockup distribution.json 1000alps
-  ```
-
-  * This adds a `LockupAccount` with given name and balance in the genesis file
-
-  * The lockup account can be queried as shown below once the chain starts
-
-* Query a lockup account:
-
-  ```bash
-  laconicd query auth module-account <account_name>
-
-  # Example
-  # laconicd query auth module-account lps_lockup
-  # account:
-  # type: laconic/LockupAccount
-  # value:
-  #   base_account:
-  #     account_number: "1"
-  #     address: laconic1mprsxp9jqe0d0lp88fxuccthwgy7tqgt5x9y65
-  #   distribution: |-
-  #     {
-  # ...
-  ```
-
-* Query a lockup account's balance:
-
-  ```bash
-  laconicd query bank balances <address>
-
-  # Example
-  lockup_account_address=$(laconicd query auth module-account lps_lockup -o json | jq -r '.account.value.base_account.address')
-  laconicd query bank balances $lockup_account_address
-  balances:
-  - amount: "1000"
-    denom: alps
-  pagination:
-    total: "1"
-  ```

proto/cerc/auction/v1/auction.proto

@@ -3,44 +3,76 @@ syntax = "proto3";
 package cerc.auction.v1;
 
 import "gogoproto/gogo.proto";
+import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "git.vdb.to/cerc-io/laconicd/x/auction";
 
 // Params defines the auction module parameters
-message Params {}
+message Params {
+  // Write custom stringer method
+  option (gogoproto.goproto_stringer) = false;
+
+  // Duration of the commits phase in seconds
+  google.protobuf.Duration commits_duration = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true,
+    (gogoproto.moretags) = "json:\"commits_duration\" yaml:\"commits_duration\""
+  ];
+
+  // Duration of the reveals phase in seconds
+  google.protobuf.Duration reveals_duration = 2 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true,
+    (gogoproto.moretags) = "json:\"reveals_duration\" yaml:\"reveals_duration\""
+  ];
+
+  // Commit fees
+  cosmos.base.v1beta1.Coin commit_fee = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "json:\"commit_fee\" yaml:\"commit_fee\""
+  ];
+
+  // Reveal fees
+  cosmos.base.v1beta1.Coin reveal_fee = 4 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "json:\"reveal_fee\" yaml:\"reveal_fee\""
+  ];
+
+  // Minimum acceptable bid amount
+  cosmos.base.v1beta1.Coin minimum_bid = 5 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "json:\"minimum_bid\" yaml:\"minimum_bid\""
+  ];
+}
 
 // Auction represents a sealed-bid on-chain auction
 message Auction {
   option (gogoproto.goproto_getters) = false;
 
   string id = 1;
-
+  string status = 2;
-  // Auction kind (vickrey | provider)
-  string kind = 2 [ (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" ];
-
-  string status = 3;
 
   // Address of the creator of the auction
-  string owner_address = 4;
+  string owner_address = 3;
 
   // Timestamp at which the auction was created
-  google.protobuf.Timestamp create_time = 5 [
+  google.protobuf.Timestamp create_time = 4 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"create_time\" yaml:\"create_time\""
   ];
 
   // Timestamp at which the commits phase concluded
-  google.protobuf.Timestamp commits_end_time = 6 [
+  google.protobuf.Timestamp commits_end_time = 5 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"commits_end_time\" yaml:\"commits_end_time\""
   ];
 
   // Timestamp at which the reveals phase concluded
-  google.protobuf.Timestamp reveals_end_time = 7 [
+  google.protobuf.Timestamp reveals_end_time = 6 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"reveals_end_time\" yaml:\"reveals_end_time\""
@@ -48,58 +80,35 @@ message Auction {
 
   // Commit and reveal fees must both be paid when committing a bid
   // Reveal fee is returned only if the bid is revealed
-  cosmos.base.v1beta1.Coin commit_fee = 8 [
+  cosmos.base.v1beta1.Coin commit_fee = 7 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"commit_fee\" yaml:\"commit_fee\""
   ];
-  cosmos.base.v1beta1.Coin reveal_fee = 9 [
+  cosmos.base.v1beta1.Coin reveal_fee = 8 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"reveal_fee\" yaml:\"reveal_fee\""
   ];
 
   // Minimum acceptable bid amount for a valid commit
-  // Only applicable in vickrey auctions
+  cosmos.base.v1beta1.Coin minimum_bid = 9 [
-  cosmos.base.v1beta1.Coin minimum_bid = 10 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"minimum_bid\" yaml:\"minimum_bid\""
   ];
 
-  // Addresses of the winners
+  // Address of the winner
-  // (single winner for vickrey auction)
+  string winner_address = 10;
-  // (multiple winners for provider auctions)
-  repeated string winner_addresses = 11;
 
-  // Winning bids, i.e. the best bids
+  // Winning bid, i.e., the highest bid
-  repeated cosmos.base.v1beta1.Coin winning_bids = 12 [
+  cosmos.base.v1beta1.Coin winning_bid = 11 [
     (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "json:\"winning_bids\" yaml:\"winning_bids\""
+    (gogoproto.moretags) = "json:\"winning_bid\" yaml:\"winning_bid\""
   ];
 
-  // Auction winning price
+  // Amount the winner pays, i.e. the second highest auction
-  // vickrey auction: second highest bid, paid by the winner
+  cosmos.base.v1beta1.Coin winning_price = 12 [
-  // provider auction: higest bid amongst winning_bids, paid by auction creator
-  // to each winner
-  cosmos.base.v1beta1.Coin winning_price = 13 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"winning_price\" yaml:\"winning_price\""
   ];
-
-  // Maximum acceptable bid amount for a valid commit
-  // Only applicable in provider auctions
-  cosmos.base.v1beta1.Coin max_price = 14 [
-    (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "json:\"max_price\" yaml:\"max_price\""
-  ];
-
-  // Number of desired providers (num of auction winners)
-  // Only applicable in provider auctions
-  int32 num_providers = 15;
-
-  // Whether funds have been released to providers
-  // Only applicable in provider auctions
-  bool funds_released = 16
-      [ (gogoproto.moretags) =
-            "json:\"funds_released\" yaml:\"funds_released\"" ];
 }
 
 // Auctions represent all the auctions in the module

proto/cerc/auction/v1/tx.proto

@@ -34,11 +34,6 @@ service Msg {
   // UpdateParams defines an operation for updating the x/staking module
   // parameters.
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
-
-  // ReleaseFunds is the command for paying the winners of provider auctions
-  rpc ReleaseFunds(MsgReleaseFunds) returns (MsgReleaseFundsResponse) {
-    option (google.api.http).post = "/cerc/auction/v1/release_funds";
-  };
 }
 
 // MsgCreateAuction defines a create auction message
@@ -46,56 +41,41 @@ message MsgCreateAuction {
   option (gogoproto.goproto_getters) = false;
   option (cosmos.msg.v1.signer) = "signer";
 
-  // Address of the signer
-  string signer = 1
-      [ (gogoproto.moretags) = "json:\"signer\" yaml:\"signer\"" ];
-
-  // Auction kind (vickrey | provider)
-  string kind = 2 [ (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" ];
-
   // Duration of the commits phase in seconds
-  google.protobuf.Duration commits_duration = 3 [
+  google.protobuf.Duration commits_duration = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true,
     (gogoproto.moretags) = "json:\"commits_duration\" yaml:\"commits_duration\""
   ];
 
   // Duration of the reveals phase in seconds
-  google.protobuf.Duration reveals_duration = 4 [
+  google.protobuf.Duration reveals_duration = 2 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true,
     (gogoproto.moretags) = "json:\"reveals_duration\" yaml:\"reveals_duration\""
   ];
 
   // Commit fees
-  cosmos.base.v1beta1.Coin commit_fee = 5 [
+  cosmos.base.v1beta1.Coin commit_fee = 3 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"commit_fee\" yaml:\"commit_fee\""
   ];
 
   // Reveal fees
-  cosmos.base.v1beta1.Coin reveal_fee = 6 [
+  cosmos.base.v1beta1.Coin reveal_fee = 4 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"reveal_fee\" yaml:\"reveal_fee\""
   ];
 
   // Minimum acceptable bid amount
-  // Only applicable in vickrey auctions
+  cosmos.base.v1beta1.Coin minimum_bid = 5 [
-  cosmos.base.v1beta1.Coin minimum_bid = 7 [
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "json:\"minimum_bid\" yaml:\"minimum_bid\""
   ];
 
-  // Maximum acceptable bid amount
+  // Address of the signer
-  // Only applicable in provider auctions
+  string signer = 6
-  cosmos.base.v1beta1.Coin max_price = 8 [
+      [ (gogoproto.moretags) = "json:\"signer\" yaml:\"signer\"" ];
-    (gogoproto.nullable) = false,
-    (gogoproto.moretags) = "json:\"max_price\" yaml:\"max_price\""
-  ];
-
-  // Number of desired providers (num of auction winners)
-  // Only applicable in provider auctions
-  int32 num_providers = 9;
 }
 
 // MsgCreateAuctionResponse returns the details of the created auction
@@ -177,27 +157,3 @@ message MsgUpdateParams {
 // MsgUpdateParamsResponse defines the response structure for executing a
 // MsgUpdateParams message.
 message MsgUpdateParamsResponse {};
-
-// ReleaseFunds defines the message to pay the winners of provider auctions
-message MsgReleaseFunds {
-  option (gogoproto.goproto_getters) = false;
-  option (cosmos.msg.v1.signer) = "signer";
-
-  // Auction id
-  string auction_id = 1
-      [ (gogoproto.moretags) = "json:\"auction_id\" yaml:\"auction_id\"" ];
-
-  // Address of the signer
-  string signer = 2
-      [ (gogoproto.moretags) = "json:\"signer\" yaml:\"signer\"" ];
-}
-
-// MsgReleaseFundsResponse returns the state of the auction after releasing the
-// funds
-message MsgReleaseFundsResponse {
-  option (gogoproto.goproto_getters) = false;
-
-  // Auction details
-  Auction auction = 1
-      [ (gogoproto.moretags) = "json:\"auction\" yaml:\"auction\"" ];
-}

proto/cerc/registry/v1/tx.proto

@@ -209,6 +209,7 @@ message MsgReassociateRecords {
 // MsgReassociateRecordsResponse
 message MsgReassociateRecordsResponse {}
 
+
 // MsgUpdateParams is the Msg/UpdateParams request type.
 message MsgUpdateParams {
   option (cosmos.msg.v1.signer) = "authority";

proto/cerc/types/v1/lockup.proto

@@ -1,26 +0,0 @@
-syntax = "proto3";
-package cerc.types.v1;
-
-import "amino/amino.proto";
-import "cosmos_proto/cosmos.proto";
-import "cosmos/auth/v1beta1/auth.proto";
-import "gogoproto/gogo.proto";
-
-option go_package = "git.vdb.to/cerc-io/laconicd/x/types/v1";
-
-// LockupAccount extends the Cosmos SDK BaseAccount with a name and distribution
-// field. It satisfies the ModuleAccountI interface to allow querying it as a
-// module account.
-message LockupAccount {
-  option (amino.name) = "laconic/LockupAccount";
-  option (amino.message_encoding) = "lockup_account";
-  option (gogoproto.goproto_getters) = false;
-
-  option (cosmos_proto.implements_interface) =
-      "cosmos.auth.v1beta1.ModuleAccountI";
-  option (cosmos_proto.implements_interface) = "cerc.types.v1.LockupAccountI";
-
-  cosmos.auth.v1beta1.BaseAccount base_account = 1 [ (gogoproto.embed) = true ];
-  string name = 2;
-  string distribution = 3;
-}

scripts/init.sh

@@ -1,20 +1,16 @@
 #!/bin/bash
 
-set -e
-
 KEY="alice"
 CHAINID=${CHAINID:-"laconic_9000-1"}
 MONIKER=${MONIKER:-"localtestnet"}
 KEYRING=${KEYRING:-"test"}
 DENOM=${DENOM:-"alnt"}
-BALANCE=${BALANCE:-"1000000000000000000000000000000"} # 10^32 alnt
+STAKING_AMOUNT=${STAKING_AMOUNT:-"1000000000000000"}
-STAKING_AMOUNT=${STAKING_AMOUNT:-"1000000000000000"} # 10^15 alnt
-MIN_GAS_PRICE=${MIN_GAS_PRICE:-"0.001"}
 LOGLEVEL=${LOGLEVEL:-"info"}
 
 input_genesis_file=${GENESIS_FILE}
 
-if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then
+if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
   # validate dependencies are installed
   command -v jq > /dev/null 2>&1 || {
     echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"
@@ -34,7 +30,7 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then
   # if $KEY exists it should be deleted
   laconicd keys add $KEY --keyring-backend $KEYRING
 
-  # Set moniker and chain-id
+  # Set moniker and chain-id for Ethermint (Moniker can be anything, chain-id must be an integer)
   laconicd init $MONIKER --chain-id $CHAINID --default-denom $DENOM
 
   if [[ -f ${input_genesis_file} ]]; then
@@ -66,7 +62,7 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then
   fi
 
   if [[ "$ONBOARDING_ENABLED" == "true" ]]; then
-    echo "Enabling onboarding."
+    echo "Enabling validator onboarding."
 
     update_genesis '.app_state["onboarding"]["params"]["onboarding_enabled"]=true'
   fi
@@ -97,16 +93,6 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then
   # Set gas limit in genesis
   update_genesis '.consensus["params"]["block"]["max_gas"]="10000000"'
 
-  # Set distribution community tax to 1 for disabling staking rewards
-  update_genesis '.app_state["distribution"]["params"]["community_tax"]="1.000000000000000000"'
-
-  echo "Setting high threshold for accepting governance proposal"
-  update_genesis '.app_state["gov"]["params"]["quorum"]="1.000000000000000000"'
-  # Set expedited threshold to 100%
-  update_genesis '.app_state["gov"]["params"]["expedited_threshold"]="1.000000000000000000"'
-  # Set normal threshold to 99% since it needs to be lesser than expedited threshold
-  update_genesis '.app_state["gov"]["params"]["threshold"]="0.990000000000000000"'
-
   # disable produce empty block
   if [[ "$OSTYPE" == "darwin"* ]]; then
       sed -i '' 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.laconicd/config/config.toml
@@ -129,9 +115,11 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data" ]; then
   fi
 
   # Allocate genesis accounts (cosmos formatted addresses)
-  laconicd genesis add-genesis-account $KEY ${BALANCE}${DENOM} --keyring-backend $KEYRING
+  # 10^30 alnt | 10^12 lnt
+  laconicd genesis add-genesis-account $KEY 1000000000000000000000000000000$DENOM --keyring-backend $KEYRING
 
   # Sign genesis transaction
+  # 10^15 alnt
   laconicd genesis gentx $KEY $STAKING_AMOUNT$DENOM --keyring-backend $KEYRING --chain-id $CHAINID
 
   # Collect genesis tx
@@ -147,7 +135,7 @@ fi
 laconicd start \
   --pruning=nothing \
   --log_level $LOGLEVEL \
-  --minimum-gas-prices=$MIN_GAS_PRICE$DENOM \
+  --minimum-gas-prices=1$DENOM \
   --api.enable \
   --rpc.laddr="tcp://0.0.0.0:26657" \
   --gql-server --gql-playground

tests/e2e/auction/suite.go

@@ -103,13 +103,10 @@ func (ets *E2ETestSuite) createAuctionAndBid(createAuction, createBid bool) stri
 
 	if createAuction {
 		auctionArgs := []string{
-			types.AuctionKindVickrey,
 			sampleCommitTime, sampleRevealTime,
 			fmt.Sprintf("10%s", ets.cfg.BondDenom),
 			fmt.Sprintf("10%s", ets.cfg.BondDenom),
 			fmt.Sprintf("100%s", ets.cfg.BondDenom),
-			fmt.Sprintf("0%s", ets.cfg.BondDenom),
-			"0",
 		}
 
 		resp, err := ets.executeTx(cli.GetCmdCreateAuction(), auctionArgs, ownerAccount)

tests/e2e/auction/tx.go

@@ -46,13 +46,10 @@ func (ets *E2ETestSuite) TestTxCommitBid() {
 		ets.Run(fmt.Sprintf("Case %s", test.msg), func() {
 			if test.createAuction {
 				auctionArgs := []string{
-					auctiontypes.AuctionKindVickrey,
 					sampleCommitTime, sampleRevealTime,
 					fmt.Sprintf("10%s", ets.cfg.BondDenom),
 					fmt.Sprintf("10%s", ets.cfg.BondDenom),
 					fmt.Sprintf("100%s", ets.cfg.BondDenom),
-					fmt.Sprintf("0%s", ets.cfg.BondDenom),
-					"0",
 				}
 
 				resp, err := ets.executeTx(cli.GetCmdCreateAuction(), auctionArgs, ownerAccount)

tests/e2e/common.go

@@ -1,13 +1,11 @@
 package e2e
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 
 	"cosmossdk.io/log"
 	pruningtypes "cosmossdk.io/store/pruning/types"
-	"github.com/cosmos/cosmos-sdk/codec"
 
 	dbm "github.com/cosmos/cosmos-db"
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
@@ -18,14 +16,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	laconicApp "git.vdb.to/cerc-io/laconicd/app"
 	auctionmodule "git.vdb.to/cerc-io/laconicd/x/auction/module"
 	bondmodule "git.vdb.to/cerc-io/laconicd/x/bond/module"
 	registrymodule "git.vdb.to/cerc-io/laconicd/x/registry/module"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	_ "git.vdb.to/cerc-io/laconicd/app/params" // import for side-effects (see init)
 	"git.vdb.to/cerc-io/laconicd/testutil/network"
 )
@@ -58,40 +54,16 @@ func NewTestNetworkFixture() network.TestFixture {
 		return app
 	}
 
-	encodingConfig := testutil.MakeTestEncodingConfig(
+	return network.TestFixture{
+		AppConstructor: appCtr,
+		GenesisState:   app.DefaultGenesis(),
+		EncodingConfig: testutil.MakeTestEncodingConfig(
 			auth.AppModuleBasic{},
 			bank.AppModuleBasic{},
 			staking.AppModuleBasic{},
 			auctionmodule.AppModule{},
 			bondmodule.AppModule{},
 			registrymodule.AppModule{},
-	)
+		),
-
-	genesisState := app.DefaultGenesis()
-	genesisState, err = updateStakingGenesisBondDenom(genesisState, encodingConfig.Codec)
-	if err != nil {
-		panic(fmt.Sprintf("failed to update genesis state: %v", err))
-	}
-
-	return network.TestFixture{
-		AppConstructor: appCtr,
-		GenesisState:   genesisState,
-		EncodingConfig: encodingConfig,
 	}
 }
-
-func updateStakingGenesisBondDenom(genesisState map[string]json.RawMessage, codec codec.Codec) (map[string]json.RawMessage, error) {
-	var stakingGenesis stakingtypes.GenesisState
-	if err := codec.UnmarshalJSON(genesisState[stakingtypes.ModuleName], &stakingGenesis); err != nil {
-		return nil, nil
-	}
-	stakingGenesis.Params.BondDenom = params.CoinUnit
-
-	stakingGenesisBz, err := codec.MarshalJSON(&stakingGenesis)
-	if err != nil {
-		return nil, nil
-	}
-	genesisState[stakingtypes.ModuleName] = stakingGenesisBz
-
-	return genesisState, nil
-}

tests/integration/auction/keeper/query_server_test.go

@@ -3,14 +3,10 @@ package keeper_test
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"cosmossdk.io/math"
-	sdkmath "cosmossdk.io/math"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	integrationTest "git.vdb.to/cerc-io/laconicd/tests/integration"
 	types "git.vdb.to/cerc-io/laconicd/x/auction"
 )
@@ -288,7 +284,6 @@ func (kts *KeeperTestSuite) TestGrpcGetAuctionsByOwner() {
 }
 
 func (kts *KeeperTestSuite) TestGrpcQueryBalance() {
-
 	testCases := []struct {
 		msg           string
 		req           *types.QueryGetAuctionModuleBalanceRequest
@@ -331,18 +326,12 @@ func (kts *KeeperTestSuite) createAuctionAndCommitBid(commitBid bool) (*types.Au
 	// Create funded account(s)
 	accounts := simtestutil.AddTestAddrs(kts.BankKeeper, integrationTest.BondDenomProvider{}, ctx, accCount, math.NewInt(1000000))
 
-	auction, err := k.CreateAuction(
+	params, err := k.GetParams(ctx)
-		ctx,
+	if err != nil {
-		types.MsgCreateAuction{
+		return nil, nil, err
-			Kind:            types.AuctionKindVickrey,
+	}
-			Signer:          accounts[0].String(),
+
-			CommitsDuration: 5 * time.Minute,
+	auction, err := k.CreateAuction(ctx, types.NewMsgCreateAuction(*params, accounts[0]))
-			RevealsDuration: 5 * time.Minute,
-			CommitFee:       sdk.NewCoin(params.CoinUnit, sdkmath.NewInt(1000)),
-			RevealFee:       sdk.NewCoin(params.CoinUnit, sdkmath.NewInt(1000)),
-			MinimumBid:      sdk.NewCoin(params.CoinUnit, sdkmath.NewInt(1000000)),
-		},
-	)
 	if err != nil {
 		return nil, nil, err
 	}

tests/integration/bond/keeper/query_server_test.go

@@ -8,7 +8,6 @@ import (
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	integrationTest "git.vdb.to/cerc-io/laconicd/tests/integration"
 	types "git.vdb.to/cerc-io/laconicd/x/bond"
 )
@@ -186,7 +185,7 @@ func (kts *KeeperTestSuite) TestGrpcGetModuleBalance() {
 			if !test.errResponse {
 				kts.Require().Nil(err)
 				kts.Require().NotNil(resp.GetBalance())
-				kts.Require().Equal(resp.GetBalance(), sdk.NewCoins(sdk.NewCoin(params.CoinUnit, math.NewInt(10))))
+				kts.Require().Equal(resp.GetBalance(), sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(10))))
 			} else {
 				kts.Require().NotNil(err)
 				kts.Require().Error(err)
@@ -202,7 +201,7 @@ func (kts *KeeperTestSuite) createBond() (*types.Bond, error) {
 	// Create funded account(s)
 	accounts := simtestutil.AddTestAddrs(kts.BankKeeper, integrationTest.BondDenomProvider{}, ctx, accCount, math.NewInt(1000))
 
-	bond, err := k.CreateBond(ctx, accounts[0], sdk.NewCoins(sdk.NewCoin(params.CoinUnit, math.NewInt(10))))
+	bond, err := k.CreateBond(ctx, accounts[0], sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(10))))
 	if err != nil {
 		return nil, err
 	}

tests/integration/common.go

@@ -23,7 +23,6 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	auctionTypes "git.vdb.to/cerc-io/laconicd/x/auction"
 	auctionkeeper "git.vdb.to/cerc-io/laconicd/x/auction/keeper"
 	auctionmodule "git.vdb.to/cerc-io/laconicd/x/auction/module"
@@ -83,8 +82,8 @@ func (tf *TestFixture) Setup() error {
 		runtime.NewKVStoreService(keys[authtypes.StoreKey]),
 		authtypes.ProtoBaseAccount,
 		maccPerms,
-		addresscodec.NewBech32Codec(params.Bech32PrefixAccAddr),
+		addresscodec.NewBech32Codec(sdk.Bech32MainPrefix),
-		params.Bech32PrefixAccAddr,
+		sdk.Bech32MainPrefix,
 		authority.String(),
 	)
 
@@ -162,5 +161,5 @@ func (tf *TestFixture) Setup() error {
 type BondDenomProvider struct{}
 
 func (bdp BondDenomProvider) BondDenom(ctx context.Context) (string, error) {
-	return params.CoinUnit, nil
+	return sdk.DefaultBondDenom, nil
 }

tests/integration/registry/keeper/common_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	integrationTest "git.vdb.to/cerc-io/laconicd/tests/integration"
 	bondTypes "git.vdb.to/cerc-io/laconicd/x/bond"
 	types "git.vdb.to/cerc-io/laconicd/x/registry"
@@ -52,7 +51,7 @@ func (kts *KeeperTestSuite) createBond() (*bondTypes.Bond, error) {
 	// Create a funded account
 	kts.accounts = simtestutil.AddTestAddrs(kts.BankKeeper, integrationTest.BondDenomProvider{}, ctx, 1, math.NewInt(1000000000000))
 
-	bond, err := kts.BondKeeper.CreateBond(ctx, kts.accounts[0], sdk.NewCoins(sdk.NewCoin(params.CoinUnit, math.NewInt(1000000000))))
+	bond, err := kts.BondKeeper.CreateBond(ctx, kts.accounts[0], sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1000000000))))
 	if err != nil {
 		return nil, err
 	}

testutil/network/network.go

@@ -60,8 +60,6 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/x/params"  // import params as a blank
 	_ "github.com/cosmos/cosmos-sdk/x/staking" // import staking as a blank
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
-	"git.vdb.to/cerc-io/laconicd/app/params"
 )
 
 // package-wide network lock to only allow one test network at a time
@@ -150,8 +148,8 @@ func DefaultConfig(factory TestFixtureFactory) Config {
 		TimeoutCommit:     2 * time.Second,
 		ChainID:           "chain-" + unsafe.Str(6),
 		NumValidators:     4,
-		BondDenom:         params.CoinUnit,
+		BondDenom:         sdk.DefaultBondDenom,
-		MinGasPrices:      fmt.Sprintf("0.000006%s", params.CoinUnit),
+		MinGasPrices:      fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom),
 		AccountTokens:     sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction),
 		StakingTokens:     sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction),
 		BondedTokens:      sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction),

x/auction/auction.pb.go

@@ -9,6 +9,7 @@ import (
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
+	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
@@ -30,10 +31,19 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // Params defines the auction module parameters
 type Params struct {
+	// Duration of the commits phase in seconds
+	CommitsDuration time.Duration `protobuf:"bytes,1,opt,name=commits_duration,json=commitsDuration,proto3,stdduration" json:"commits_duration" json:"commits_duration" yaml:"commits_duration"`
+	// Duration of the reveals phase in seconds
+	RevealsDuration time.Duration `protobuf:"bytes,2,opt,name=reveals_duration,json=revealsDuration,proto3,stdduration" json:"reveals_duration" json:"reveals_duration" yaml:"reveals_duration"`
+	// Commit fees
+	CommitFee types.Coin `protobuf:"bytes,3,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"`
+	// Reveal fees
+	RevealFee types.Coin `protobuf:"bytes,4,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"`
+	// Minimum acceptable bid amount
+	MinimumBid types.Coin `protobuf:"bytes,5,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"`
 }
 
 func (m *Params) Reset()      { *m = Params{} }
-func (m *Params) String() string { return proto.CompactTextString(m) }
 func (*Params) ProtoMessage() {}
 func (*Params) Descriptor() ([]byte, []int) {
 	return fileDescriptor_34b162eb5b365523, []int{0}
@@ -65,47 +75,65 @@ func (m *Params) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Params proto.InternalMessageInfo
 
+func (m *Params) GetCommitsDuration() time.Duration {
+	if m != nil {
+		return m.CommitsDuration
+	}
+	return 0
+}
+
+func (m *Params) GetRevealsDuration() time.Duration {
+	if m != nil {
+		return m.RevealsDuration
+	}
+	return 0
+}
+
+func (m *Params) GetCommitFee() types.Coin {
+	if m != nil {
+		return m.CommitFee
+	}
+	return types.Coin{}
+}
+
+func (m *Params) GetRevealFee() types.Coin {
+	if m != nil {
+		return m.RevealFee
+	}
+	return types.Coin{}
+}
+
+func (m *Params) GetMinimumBid() types.Coin {
+	if m != nil {
+		return m.MinimumBid
+	}
+	return types.Coin{}
+}
+
 // Auction represents a sealed-bid on-chain auction
 type Auction struct {
 	Id     string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// Auction kind (vickrey | provider)
+	Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
-	Kind   string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"`
-	Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"`
 	// Address of the creator of the auction
-	OwnerAddress string `protobuf:"bytes,4,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
+	OwnerAddress string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
 	// Timestamp at which the auction was created
-	CreateTime time.Time `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3,stdtime" json:"create_time" json:"create_time" yaml:"create_time"`
+	CreateTime time.Time `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3,stdtime" json:"create_time" json:"create_time" yaml:"create_time"`
 	// Timestamp at which the commits phase concluded
-	CommitsEndTime time.Time `protobuf:"bytes,6,opt,name=commits_end_time,json=commitsEndTime,proto3,stdtime" json:"commits_end_time" json:"commits_end_time" yaml:"commits_end_time"`
+	CommitsEndTime time.Time `protobuf:"bytes,5,opt,name=commits_end_time,json=commitsEndTime,proto3,stdtime" json:"commits_end_time" json:"commits_end_time" yaml:"commits_end_time"`
 	// Timestamp at which the reveals phase concluded
-	RevealsEndTime time.Time `protobuf:"bytes,7,opt,name=reveals_end_time,json=revealsEndTime,proto3,stdtime" json:"reveals_end_time" json:"reveals_end_time" yaml:"reveals_end_time"`
+	RevealsEndTime time.Time `protobuf:"bytes,6,opt,name=reveals_end_time,json=revealsEndTime,proto3,stdtime" json:"reveals_end_time" json:"reveals_end_time" yaml:"reveals_end_time"`
 	// Commit and reveal fees must both be paid when committing a bid
 	// Reveal fee is returned only if the bid is revealed
-	CommitFee types.Coin `protobuf:"bytes,8,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"`
+	CommitFee types.Coin `protobuf:"bytes,7,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"`
-	RevealFee types.Coin `protobuf:"bytes,9,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"`
+	RevealFee types.Coin `protobuf:"bytes,8,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"`
 	// Minimum acceptable bid amount for a valid commit
-	// Only applicable in vickrey auctions
+	MinimumBid types.Coin `protobuf:"bytes,9,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"`
-	MinimumBid types.Coin `protobuf:"bytes,10,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"`
+	// Address of the winner
-	// Addresses of the winners
+	WinnerAddress string `protobuf:"bytes,10,opt,name=winner_address,json=winnerAddress,proto3" json:"winner_address,omitempty"`
-	// (single winner for vickrey auction)
+	// Winning bid, i.e., the highest bid
-	// (multiple winners for provider auctions)
+	WinningBid types.Coin `protobuf:"bytes,11,opt,name=winning_bid,json=winningBid,proto3" json:"winning_bid" json:"winning_bid" yaml:"winning_bid"`
-	WinnerAddresses []string `protobuf:"bytes,11,rep,name=winner_addresses,json=winnerAddresses,proto3" json:"winner_addresses,omitempty"`
+	// Amount the winner pays, i.e. the second highest auction
-	// Winning bids, i.e. the best bids
+	WinningPrice types.Coin `protobuf:"bytes,12,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price" json:"winning_price" yaml:"winning_price"`
-	WinningBids []types.Coin `protobuf:"bytes,12,rep,name=winning_bids,json=winningBids,proto3" json:"winning_bids" json:"winning_bids" yaml:"winning_bids"`
-	// Auction winning price
-	// vickrey auction: second highest bid, paid by the winner
-	// provider auction: higest bid amongst winning_bids, paid by auction creator
-	// to each winner
-	WinningPrice types.Coin `protobuf:"bytes,13,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price" json:"winning_price" yaml:"winning_price"`
-	// Maximum acceptable bid amount for a valid commit
-	// Only applicable in provider auctions
-	MaxPrice types.Coin `protobuf:"bytes,14,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"`
-	// Number of desired providers (num of auction winners)
-	// Only applicable in provider auctions
-	NumProviders int32 `protobuf:"varint,15,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"`
-	// Whether funds have been released to providers
-	// Only applicable in provider auctions
-	FundsReleased bool `protobuf:"varint,16,opt,name=funds_released,json=fundsReleased,proto3" json:"funds_released,omitempty" json:"funds_released" yaml:"funds_released"`
 }
 
 func (m *Auction) Reset()         { *m = Auction{} }
@@ -235,60 +263,57 @@ func init() {
 func init() { proto.RegisterFile("cerc/auction/v1/auction.proto", fileDescriptor_34b162eb5b365523) }
 
 var fileDescriptor_34b162eb5b365523 = []byte{
-	// 846 bytes of a gzipped FileDescriptorProto
+	// 798 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x96, 0xcd, 0x6e, 0xeb, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x4f, 0xdb, 0x4a,
-	0x14, 0xc7, 0xe3, 0x7e, 0xe4, 0x26, 0x27, 0x4d, 0x5a, 0x59, 0x08, 0x4c, 0xd1, 0x8d, 0x43, 0xaa,
+	0x14, 0x8d, 0x49, 0x08, 0xf1, 0x98, 0xc0, 0x93, 0xf5, 0xf4, 0x94, 0x17, 0x89, 0x04, 0x05, 0x21,
-	0x8a, 0x54, 0x57, 0xd7, 0x56, 0x60, 0x57, 0x16, 0xa8, 0x46, 0x20, 0x90, 0x58, 0x54, 0x16, 0x62,
+	0xf1, 0xf4, 0x84, 0xad, 0xd0, 0x5d, 0xba, 0xa8, 0x48, 0x3f, 0xd4, 0x4a, 0x5d, 0x20, 0xab, 0xab,
-	0xc1, 0xc6, 0x1a, 0x7b, 0xa6, 0xe9, 0x40, 0x66, 0xa6, 0x78, 0xec, 0xdc, 0xb2, 0x64, 0xc7, 0xf2,
+	0x6e, 0xa2, 0xb1, 0x67, 0x08, 0x53, 0xc5, 0x1e, 0xea, 0x71, 0x42, 0xbb, 0xec, 0xae, 0x4b, 0xd4,
-	0xbe, 0x01, 0xec, 0x79, 0x91, 0xbb, 0xbc, 0x4b, 0x56, 0x01, 0xb5, 0x6f, 0xd0, 0x27, 0x40, 0x9e,
+	0x15, 0xbb, 0xf6, 0xe7, 0xb0, 0x2b, 0xcb, 0xae, 0x68, 0x05, 0xff, 0xa0, 0xbf, 0xa0, 0x9a, 0xaf,
-	0x8f, 0xd4, 0x31, 0x1f, 0xa1, 0x57, 0xea, 0x6e, 0xce, 0x7f, 0xe6, 0xcc, 0xef, 0x9c, 0xc9, 0xf1,
+	0x64, 0x6c, 0xa8, 0xd2, 0x2c, 0x60, 0xe7, 0x39, 0x33, 0xf7, 0x9e, 0x73, 0x2f, 0xf7, 0xdc, 0x00,
-	0x5f, 0x81, 0xa7, 0x19, 0xc9, 0xb3, 0x10, 0x95, 0x59, 0x41, 0x05, 0x0f, 0x17, 0x53, 0xbb, 0x0c,
+	0x36, 0x22, 0x9c, 0x46, 0x3e, 0x1c, 0x47, 0x19, 0xa1, 0x89, 0x3f, 0xe9, 0xea, 0x4f, 0xef, 0x38,
-	0xae, 0x72, 0x51, 0x08, 0x77, 0xbf, 0xda, 0x0e, 0xac, 0xb6, 0x98, 0x1e, 0xbe, 0x35, 0x13, 0x33,
+	0xa5, 0x19, 0x75, 0xd7, 0xf9, 0xb5, 0xa7, 0xb1, 0x49, 0xb7, 0xf9, 0xf7, 0x90, 0x0e, 0xa9, 0xb8,
-	0xa1, 0xf6, 0xc2, 0x6a, 0xa5, 0x8f, 0x1d, 0xfa, 0x33, 0x21, 0x66, 0x73, 0x12, 0xaa, 0x28, 0x2d,
+	0xf3, 0xf9, 0x97, 0x7c, 0xd6, 0x6c, 0x0d, 0x29, 0x1d, 0x8e, 0xb0, 0x2f, 0x4e, 0xe1, 0xf8, 0xd0,
-	0x2f, 0xc2, 0x82, 0x32, 0x22, 0x0b, 0xc4, 0xae, 0xcc, 0x81, 0x61, 0x26, 0x24, 0x13, 0x32, 0x4c,
+	0x47, 0xe3, 0x14, 0xce, 0xd2, 0x34, 0xdb, 0xc5, 0xfb, 0x8c, 0xc4, 0x98, 0x65, 0x30, 0x3e, 0xd6,
-	0x91, 0x24, 0xe1, 0x62, 0x9a, 0x92, 0x02, 0x4d, 0xc3, 0x4c, 0x50, 0xc3, 0x19, 0x77, 0xa0, 0x7d,
+	0x09, 0x22, 0xca, 0x62, 0xca, 0xfc, 0x10, 0x32, 0xec, 0x4f, 0xba, 0x21, 0xce, 0x60, 0xd7, 0x8f,
-	0x8e, 0x72, 0xc4, 0xe4, 0xf8, 0x37, 0x80, 0x27, 0x67, 0x9a, 0xe7, 0x0e, 0x60, 0x8b, 0x62, 0xcf,
+	0x28, 0x51, 0x09, 0x3a, 0x5f, 0x2b, 0xa0, 0x7a, 0x00, 0x53, 0x18, 0x33, 0xf7, 0x83, 0x05, 0xfe,
-	0x19, 0x39, 0x93, 0x6e, 0xbc, 0x45, 0xb1, 0x1b, 0xc2, 0xce, 0xf7, 0x94, 0x63, 0x6f, 0xab, 0x52,
+	0x8a, 0x68, 0x1c, 0x93, 0x8c, 0x0d, 0x34, 0x4d, 0xc3, 0xda, 0xb4, 0x76, 0x9c, 0xbd, 0x7f, 0x3d,
-	0xa2, 0xf7, 0xee, 0x96, 0xfe, 0x3b, 0xdf, 0x49, 0xc1, 0x4f, 0xc7, 0x95, 0x3a, 0x1e, 0xfd, 0x88,
+	0xc9, 0xe3, 0x69, 0x1e, 0xef, 0x89, 0x7a, 0xd0, 0x7f, 0x78, 0x7e, 0xd9, 0x2e, 0xfd, 0xbc, 0x6c,
-	0xd8, 0xdc, 0xac, 0x63, 0x75, 0xd0, 0x7d, 0x1b, 0xda, 0xb2, 0x40, 0x45, 0x29, 0xbd, 0x6d, 0x75,
+	0xfb, 0x6f, 0x18, 0x4d, 0x7a, 0x9d, 0x62, 0x82, 0xce, 0xe6, 0x7b, 0x18, 0x8f, 0x6e, 0xc1, 0xcf,
-	0x89, 0x89, 0xdc, 0x23, 0xe8, 0x8b, 0x17, 0x9c, 0xe4, 0x09, 0xc2, 0x38, 0x27, 0x52, 0x7a, 0x3b,
+	0xbe, 0xb7, 0xad, 0x60, 0x5d, 0xc1, 0x3a, 0x9b, 0xd0, 0x90, 0xe2, 0x09, 0x86, 0x23, 0x43, 0xc3,
-	0x6a, 0x7b, 0x4f, 0x89, 0x67, 0x5a, 0x73, 0x39, 0xf4, 0xb2, 0x9c, 0xa0, 0x82, 0x24, 0x55, 0x37,
+	0xd2, 0x82, 0x1a, 0x8a, 0x09, 0xb4, 0x86, 0x1b, 0xb8, 0xd4, 0xa0, 0xe0, 0xa9, 0x06, 0x0c, 0x80,
-	0xde, 0xee, 0xc8, 0x99, 0xf4, 0x3e, 0x3c, 0x0c, 0x74, 0xab, 0x81, 0x6d, 0x35, 0xf8, 0xda, 0xb6,
+	0x94, 0x35, 0x38, 0xc4, 0xb8, 0x51, 0x56, 0xe4, 0xb2, 0x8f, 0x1e, 0xef, 0xa3, 0xa7, 0xfa, 0xe8,
-	0x1a, 0x4d, 0x5f, 0x2d, 0xfd, 0xd6, 0xdd, 0xd2, 0x3f, 0xd6, 0x45, 0xd5, 0x92, 0x6d, 0x6d, 0x75,
+	0x3d, 0xa6, 0x24, 0xe9, 0xff, 0xaf, 0xc8, 0xb7, 0xcc, 0x06, 0xf0, 0xd0, 0x7c, 0xe9, 0x02, 0x09,
-	0xe9, 0xe5, 0x1f, 0xbe, 0x13, 0x83, 0x56, 0xaa, 0x3b, 0xdc, 0x9f, 0x1c, 0x38, 0xc8, 0x04, 0x63,
+	0x6c, 0x79, 0x78, 0x86, 0x31, 0xa7, 0x91, 0xcc, 0x82, 0xa6, 0xb2, 0x20, 0xcd, 0x2c, 0x34, 0x5f,
-	0xb4, 0x90, 0x09, 0xe1, 0x58, 0x53, 0xdb, 0x1b, 0xa9, 0x1f, 0x1b, 0x6a, 0x68, 0xa8, 0x8d, 0x1b,
+	0x9d, 0xa2, 0x91, 0x07, 0x4e, 0x43, 0x80, 0x13, 0x93, 0x84, 0xc4, 0xe3, 0x78, 0x10, 0x12, 0xd4,
-	0x56, 0xe8, 0xa6, 0xae, 0xf8, 0x03, 0x23, 0x7f, 0xc6, 0xf1, 0xaa, 0x86, 0x9c, 0x2c, 0x08, 0x9a,
+	0x58, 0x9e, 0xc7, 0xb3, 0xab, 0x78, 0xb6, 0x25, 0x8f, 0x11, 0xab, 0x89, 0x4c, 0x28, 0x00, 0xea,
-	0xd7, 0x6a, 0x78, 0xf2, 0xd0, 0x1a, 0x9a, 0x37, 0xd8, 0x1a, 0xfe, 0xa6, 0xeb, 0x1a, 0x8c, 0x6c,
+	0xd4, 0x27, 0xa8, 0x57, 0x39, 0xfb, 0xd2, 0x2e, 0x75, 0x3e, 0xd5, 0xc0, 0xca, 0xbe, 0x9c, 0x6b,
-	0x6b, 0x20, 0x00, 0xba, 0xaa, 0xe4, 0x82, 0x10, 0xaf, 0xa3, 0xe0, 0xef, 0x06, 0x7a, 0x80, 0x82,
+	0x77, 0x0d, 0x2c, 0x11, 0x24, 0x66, 0xc8, 0x0e, 0x96, 0x08, 0x72, 0xff, 0x01, 0x55, 0x96, 0xc1,
-	0x6a, 0x80, 0x02, 0x33, 0x40, 0xc1, 0xa7, 0x82, 0xf2, 0xe8, 0x99, 0x61, 0x1f, 0xd5, 0xfb, 0xaf,
+	0x6c, 0xcc, 0xc4, 0xdf, 0xd4, 0x0e, 0xd4, 0xc9, 0xdd, 0x02, 0x75, 0x7a, 0x92, 0xe0, 0x74, 0x00,
-	0x52, 0xd7, 0x3b, 0x57, 0x4a, 0xdc, 0xd5, 0xc1, 0xe7, 0x44, 0x61, 0x34, 0x58, 0x61, 0xba, 0x0f,
+	0x11, 0x4a, 0x31, 0x63, 0xa2, 0xeb, 0x76, 0xb0, 0x2a, 0xc0, 0x7d, 0x89, 0xb9, 0x09, 0x70, 0xa2,
-	0xc4, 0xdc, 0xa7, 0xae, 0x37, 0x67, 0x30, 0x3a, 0xa8, 0x30, 0x14, 0x7a, 0x8c, 0x72, 0xca, 0x4a,
+	0x14, 0xc3, 0x0c, 0x0f, 0xf8, 0x90, 0xab, 0x8e, 0x35, 0x6f, 0x4c, 0xc5, 0x2b, 0xed, 0x80, 0x7e,
-	0x96, 0xa4, 0x14, 0x7b, 0xb0, 0x89, 0xf3, 0x7c, 0x7d, 0x88, 0x6a, 0xb9, 0x16, 0x54, 0x97, 0x62,
+	0x37, 0x5f, 0x8a, 0x11, 0x3c, 0xfd, 0xd3, 0x18, 0xd0, 0x29, 0x1f, 0x06, 0x20, 0x11, 0x9e, 0x23,
-	0x30, 0x51, 0x44, 0xb1, 0x7b, 0x02, 0x07, 0x2f, 0x28, 0xaf, 0x8d, 0x35, 0x91, 0x5e, 0x6f, 0xb4,
+	0xe7, 0x07, 0x9c, 0x20, 0xc9, 0xba, 0x3c, 0x97, 0xf5, 0x37, 0x86, 0xd0, 0x19, 0x8a, 0x86, 0x98,
-	0x3d, 0xe9, 0xc6, 0xfb, 0x5a, 0x3f, 0xb3, 0xb2, 0xcb, 0x60, 0xaf, 0x92, 0x28, 0x9f, 0x55, 0xd7,
+	0xe2, 0x82, 0x7f, 0x4d, 0xc1, 0x4f, 0x13, 0x34, 0xd5, 0xa0, 0xc7, 0x76, 0xaa, 0xa1, 0xba, 0xa8,
-	0x48, 0x6f, 0x6f, 0xb4, 0xfd, 0xdf, 0x65, 0x85, 0xa6, 0xac, 0x0f, 0x74, 0x59, 0xf5, 0x64, 0x5b,
+	0x86, 0x62, 0x86, 0xa2, 0x21, 0x0a, 0x1a, 0x14, 0xac, 0x35, 0xe4, 0xfd, 0xb0, 0x72, 0x3f, 0x7e,
-	0xd7, 0x9a, 0x16, 0xf7, 0x4c, 0x18, 0x51, 0x2c, 0xdd, 0x1f, 0xa0, 0x6f, 0x77, 0xaf, 0x72, 0x9a,
+	0xa8, 0xdd, 0x93, 0x1f, 0xec, 0xbb, 0xf3, 0x83, 0xbb, 0x0d, 0xd6, 0x4e, 0x48, 0x62, 0x8e, 0x35,
-	0x11, 0xaf, 0xbf, 0xe9, 0x19, 0xec, 0xb7, 0x74, 0xb2, 0xce, 0x53, 0xd9, 0x4d, 0xa0, 0x16, 0x63,
+	0x10, 0x63, 0x5d, 0x97, 0xa8, 0x9e, 0x6b, 0x02, 0x1c, 0x0e, 0x90, 0x64, 0x28, 0x14, 0x39, 0x0b,
-	0xdb, 0xd1, 0x79, 0x15, 0xba, 0x08, 0xba, 0x0c, 0x5d, 0x1b, 0xdc, 0x60, 0x13, 0xee, 0xc4, 0xe0,
+	0x2a, 0x32, 0x62, 0xb5, 0x22, 0x13, 0x0a, 0x80, 0x3a, 0x71, 0x45, 0x6f, 0x41, 0x5d, 0xdf, 0x1d,
-	0xde, 0x37, 0xaf, 0x6e, 0x33, 0x57, 0x6f, 0xbe, 0x12, 0xe2, 0x0e, 0x43, 0xd7, 0x1a, 0x71, 0x04,
+	0xa7, 0x24, 0xc2, 0x8d, 0xd5, 0x79, 0x64, 0xda, 0x43, 0xff, 0xe5, 0xc9, 0x44, 0x74, 0x91, 0x4e,
-	0x7d, 0x5e, 0xb2, 0xe4, 0x2a, 0x17, 0x0b, 0x8a, 0x49, 0x2e, 0xbd, 0xfd, 0x91, 0x33, 0xd9, 0x8d,
+	0x82, 0xc1, 0xaa, 0x3a, 0x1f, 0xf0, 0x63, 0xaf, 0xf2, 0x91, 0x2f, 0x85, 0x97, 0xa0, 0xa6, 0x76,
-	0xf7, 0x78, 0xc9, 0xce, 0xad, 0xe6, 0x7e, 0x03, 0x83, 0x8b, 0x92, 0x63, 0x99, 0xe4, 0x64, 0x4e,
+	0x02, 0x73, 0x7b, 0xa0, 0xa6, 0x7e, 0xf7, 0x58, 0xc3, 0xda, 0x2c, 0xef, 0x38, 0x7b, 0x0d, 0xaf,
-	0x90, 0x24, 0xd8, 0x3b, 0x18, 0x39, 0x93, 0x4e, 0x14, 0xde, 0x2d, 0xfd, 0x67, 0x9a, 0xb6, 0xbe,
+	0xf0, 0x6b, 0xe8, 0xa9, 0xc7, 0xfd, 0x0a, 0xa7, 0x0f, 0xa6, 0xef, 0x55, 0xb6, 0xcf, 0xcb, 0xa0,
-	0x6f, 0x91, 0x0d, 0x35, 0xee, 0x2b, 0x21, 0x36, 0xf1, 0xe9, 0xce, 0xcf, 0xbf, 0xfa, 0xad, 0xf1,
+	0xcc, 0xcb, 0xd9, 0x00, 0x40, 0xdd, 0x0c, 0xa6, 0x6b, 0xc6, 0x56, 0xc8, 0x0b, 0xd1, 0xff, 0x90,
-	0x57, 0xd0, 0x31, 0x66, 0x29, 0xdd, 0x53, 0xe8, 0x18, 0xa3, 0x96, 0x9e, 0xa3, 0x7e, 0x4f, 0x2f,
+	0x20, 0x64, 0xf4, 0x5f, 0x6e, 0x9d, 0xba, 0x44, 0x75, 0xff, 0x67, 0x4b, 0xa9, 0x9c, 0x5b, 0x4a,
-	0x68, 0xd8, 0x77, 0x60, 0x0e, 0x47, 0x3b, 0x55, 0xbf, 0xf1, 0xea, 0xbc, 0xb9, 0xed, 0x97, 0x5d,
+	0x6d, 0xe0, 0xa8, 0x51, 0x3d, 0x82, 0xec, 0x48, 0xec, 0x1b, 0x3b, 0x50, 0x56, 0x78, 0x0e, 0xd9,
-	0xd8, 0xae, 0x06, 0xe9, 0x29, 0x80, 0xd9, 0x49, 0x56, 0xfe, 0xdb, 0x35, 0xca, 0x97, 0xd8, 0x3d,
+	0x91, 0x58, 0x48, 0xf2, 0xc1, 0x1f, 0xae, 0x86, 0xe2, 0x42, 0x9a, 0x05, 0x17, 0xbc, 0x61, 0x2e,
-	0x86, 0x41, 0x4a, 0x31, 0xae, 0xd9, 0xa7, 0x32, 0xe4, 0xb8, 0xaf, 0x55, 0xeb, 0x9f, 0xff, 0x66,
+	0x24, 0x81, 0xdc, 0x62, 0xc4, 0xea, 0x5d, 0x19, 0x31, 0x01, 0x8e, 0xf2, 0x8e, 0x28, 0x6b, 0x65,
-	0xbe, 0x3e, 0xf4, 0xcc, 0x27, 0x79, 0x89, 0xe4, 0xa5, 0xb1, 0x5e, 0xf3, 0xc9, 0x7f, 0x81, 0xe4,
+	0xd1, 0xb2, 0x8c, 0xe0, 0x82, 0x17, 0x8d, 0xb2, 0x24, 0xa2, 0xcb, 0xba, 0x0f, 0xe3, 0x63, 0x00,
-	0xa5, 0x32, 0x5e, 0x7d, 0xe0, 0x0d, 0x8d, 0xf7, 0x3e, 0xb9, 0xe1, 0x01, 0x75, 0xe3, 0x55, 0xca,
+	0x42, 0x82, 0x06, 0x30, 0xa6, 0xe3, 0x24, 0x9b, 0xef, 0xfb, 0x02, 0xcd, 0x2c, 0x54, 0xd3, 0x18,
-	0x3f, 0x18, 0x4e, 0xfb, 0xb1, 0x0c, 0x87, 0x43, 0xcf, 0x78, 0xc4, 0xff, 0x74, 0xd5, 0x46, 0x5b,
+	0x48, 0x60, 0x87, 0x04, 0xed, 0x8b, 0x6f, 0x39, 0xa1, 0xfd, 0x47, 0xe7, 0x57, 0x2d, 0xeb, 0xe2,
-	0xb5, 0xe4, 0x86, 0xe7, 0xd4, 0xda, 0xd2, 0x8a, 0x6d, 0xab, 0x66, 0x70, 0x9d, 0xc7, 0x32, 0x38,
+	0xaa, 0x65, 0xfd, 0xb8, 0x6a, 0x59, 0xa7, 0xd7, 0xad, 0xd2, 0xc5, 0x75, 0xab, 0xf4, 0xed, 0xba,
-	0x02, 0x90, 0x52, 0x9c, 0x20, 0x26, 0x4a, 0x5e, 0x3c, 0xd8, 0x47, 0xef, 0x53, 0x2d, 0xa6, 0xa6,
+	0x55, 0x7a, 0xbd, 0x3d, 0x24, 0x99, 0x37, 0x41, 0xa1, 0x97, 0x51, 0x9f, 0x4f, 0xfd, 0x2e, 0xa1,
-	0xc4, 0xdd, 0x94, 0xe2, 0x33, 0xb5, 0xd6, 0x13, 0x1a, 0x7d, 0xf2, 0xea, 0x66, 0xe8, 0xbc, 0xbe,
+	0xfe, 0x08, 0x46, 0x34, 0x21, 0x11, 0xf2, 0xdf, 0xe9, 0xff, 0x12, 0xc3, 0xaa, 0xe8, 0xf3, 0x83,
-	0x19, 0x3a, 0x7f, 0xde, 0x0c, 0x9d, 0x97, 0xb7, 0xc3, 0xd6, 0xeb, 0xdb, 0x61, 0xeb, 0xf7, 0xdb,
+	0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0xbb, 0x15, 0xc2, 0x47, 0x0a, 0x00, 0x00,
-	0x61, 0xeb, 0xdb, 0xe3, 0x19, 0x2d, 0x82, 0x05, 0x4e, 0x83, 0x42, 0x84, 0xd5, 0xd4, 0x3f, 0xa7,
-	0x22, 0x9c, 0xa3, 0x4c, 0x70, 0x9a, 0xe1, 0xf0, 0xda, 0xfe, 0xad, 0x49, 0xdb, 0xea, 0x9d, 0x3f,
-	0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x67, 0x62, 0x6b, 0xf8, 0x08, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -311,6 +336,52 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	{
+		size, err := m.MinimumBid.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintAuction(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x2a
+	{
+		size, err := m.RevealFee.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintAuction(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x22
+	{
+		size, err := m.CommitFee.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintAuction(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x1a
+	n4, err4 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RevealsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RevealsDuration):])
+	if err4 != nil {
+		return 0, err4
+	}
+	i -= n4
+	i = encodeVarintAuction(dAtA, i, uint64(n4))
+	i--
+	dAtA[i] = 0x12
+	n5, err5 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.CommitsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CommitsDuration):])
+	if err5 != nil {
+		return 0, err5
+	}
+	i -= n5
+	i = encodeVarintAuction(dAtA, i, uint64(n5))
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -334,33 +405,6 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.FundsReleased {
-		i--
-		if m.FundsReleased {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x1
-		i--
-		dAtA[i] = 0x80
-	}
-	if m.NumProviders != 0 {
-		i = encodeVarintAuction(dAtA, i, uint64(m.NumProviders))
-		i--
-		dAtA[i] = 0x78
-	}
-	{
-		size, err := m.MaxPrice.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintAuction(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x72
 	{
 		size, err := m.WinningPrice.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -370,11 +414,9 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintAuction(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x6a
+	dAtA[i] = 0x62
-	if len(m.WinningBids) > 0 {
-		for iNdEx := len(m.WinningBids) - 1; iNdEx >= 0; iNdEx-- {
 	{
-				size, err := m.WinningBids[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+		size, err := m.WinningBid.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
 			return 0, err
 		}
@@ -382,17 +424,13 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintAuction(dAtA, i, uint64(size))
 	}
 	i--
-			dAtA[i] = 0x62
-		}
-	}
-	if len(m.WinnerAddresses) > 0 {
-		for iNdEx := len(m.WinnerAddresses) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.WinnerAddresses[iNdEx])
-			copy(dAtA[i:], m.WinnerAddresses[iNdEx])
-			i = encodeVarintAuction(dAtA, i, uint64(len(m.WinnerAddresses[iNdEx])))
-			i--
 	dAtA[i] = 0x5a
-		}
+	if len(m.WinnerAddress) > 0 {
+		i -= len(m.WinnerAddress)
+		copy(dAtA[i:], m.WinnerAddress)
+		i = encodeVarintAuction(dAtA, i, uint64(len(m.WinnerAddress)))
+		i--
+		dAtA[i] = 0x52
 	}
 	{
 		size, err := m.MinimumBid.MarshalToSizedBuffer(dAtA[:i])
@@ -403,7 +441,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintAuction(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x52
+	dAtA[i] = 0x4a
 	{
 		size, err := m.RevealFee.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -413,7 +451,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintAuction(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x4a
+	dAtA[i] = 0x42
 	{
 		size, err := m.CommitFee.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -423,50 +461,43 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintAuction(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x42
-	n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.RevealsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.RevealsEndTime):])
-	if err6 != nil {
-		return 0, err6
-	}
-	i -= n6
-	i = encodeVarintAuction(dAtA, i, uint64(n6))
-	i--
 	dAtA[i] = 0x3a
-	n7, err7 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CommitsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CommitsEndTime):])
+	n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.RevealsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.RevealsEndTime):])
-	if err7 != nil {
+	if err11 != nil {
-		return 0, err7
+		return 0, err11
 	}
-	i -= n7
+	i -= n11
-	i = encodeVarintAuction(dAtA, i, uint64(n7))
+	i = encodeVarintAuction(dAtA, i, uint64(n11))
 	i--
 	dAtA[i] = 0x32
-	n8, err8 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CreateTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CreateTime):])
+	n12, err12 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CommitsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CommitsEndTime):])
-	if err8 != nil {
+	if err12 != nil {
-		return 0, err8
+		return 0, err12
 	}
-	i -= n8
+	i -= n12
-	i = encodeVarintAuction(dAtA, i, uint64(n8))
+	i = encodeVarintAuction(dAtA, i, uint64(n12))
 	i--
 	dAtA[i] = 0x2a
+	n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CreateTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CreateTime):])
+	if err13 != nil {
+		return 0, err13
+	}
+	i -= n13
+	i = encodeVarintAuction(dAtA, i, uint64(n13))
+	i--
+	dAtA[i] = 0x22
 	if len(m.OwnerAddress) > 0 {
 		i -= len(m.OwnerAddress)
 		copy(dAtA[i:], m.OwnerAddress)
 		i = encodeVarintAuction(dAtA, i, uint64(len(m.OwnerAddress)))
 		i--
-		dAtA[i] = 0x22
+		dAtA[i] = 0x1a
 	}
 	if len(m.Status) > 0 {
 		i -= len(m.Status)
 		copy(dAtA[i:], m.Status)
 		i = encodeVarintAuction(dAtA, i, uint64(len(m.Status)))
 		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.Kind) > 0 {
-		i -= len(m.Kind)
-		copy(dAtA[i:], m.Kind)
-		i = encodeVarintAuction(dAtA, i, uint64(len(m.Kind)))
-		i--
 		dAtA[i] = 0x12
 	}
 	if len(m.Id) > 0 {
@@ -556,12 +587,12 @@ func (m *Bid) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	}
 	i--
 	dAtA[i] = 0x42
-	n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.RevealTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.RevealTime):])
+	n16, err16 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.RevealTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.RevealTime):])
-	if err11 != nil {
+	if err16 != nil {
-		return 0, err11
+		return 0, err16
 	}
-	i -= n11
+	i -= n16
-	i = encodeVarintAuction(dAtA, i, uint64(n11))
+	i = encodeVarintAuction(dAtA, i, uint64(n16))
 	i--
 	dAtA[i] = 0x3a
 	{
@@ -574,12 +605,12 @@ func (m *Bid) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	}
 	i--
 	dAtA[i] = 0x32
-	n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CommitTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CommitTime):])
+	n18, err18 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CommitTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CommitTime):])
-	if err13 != nil {
+	if err18 != nil {
-		return 0, err13
+		return 0, err18
 	}
-	i -= n13
+	i -= n18
-	i = encodeVarintAuction(dAtA, i, uint64(n13))
+	i = encodeVarintAuction(dAtA, i, uint64(n18))
 	i--
 	dAtA[i] = 0x2a
 	if len(m.CommitHash) > 0 {
@@ -630,6 +661,16 @@ func (m *Params) Size() (n int) {
 	}
 	var l int
 	_ = l
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CommitsDuration)
+	n += 1 + l + sovAuction(uint64(l))
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RevealsDuration)
+	n += 1 + l + sovAuction(uint64(l))
+	l = m.CommitFee.Size()
+	n += 1 + l + sovAuction(uint64(l))
+	l = m.RevealFee.Size()
+	n += 1 + l + sovAuction(uint64(l))
+	l = m.MinimumBid.Size()
+	n += 1 + l + sovAuction(uint64(l))
 	return n
 }
 
@@ -643,10 +684,6 @@ func (m *Auction) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovAuction(uint64(l))
 	}
-	l = len(m.Kind)
-	if l > 0 {
-		n += 1 + l + sovAuction(uint64(l))
-	}
 	l = len(m.Status)
 	if l > 0 {
 		n += 1 + l + sovAuction(uint64(l))
@@ -667,28 +704,14 @@ func (m *Auction) Size() (n int) {
 	n += 1 + l + sovAuction(uint64(l))
 	l = m.MinimumBid.Size()
 	n += 1 + l + sovAuction(uint64(l))
-	if len(m.WinnerAddresses) > 0 {
+	l = len(m.WinnerAddress)
-		for _, s := range m.WinnerAddresses {
+	if l > 0 {
-			l = len(s)
 		n += 1 + l + sovAuction(uint64(l))
 	}
-	}
+	l = m.WinningBid.Size()
-	if len(m.WinningBids) > 0 {
-		for _, e := range m.WinningBids {
-			l = e.Size()
 	n += 1 + l + sovAuction(uint64(l))
-		}
-	}
 	l = m.WinningPrice.Size()
 	n += 1 + l + sovAuction(uint64(l))
-	l = m.MaxPrice.Size()
-	n += 1 + l + sovAuction(uint64(l))
-	if m.NumProviders != 0 {
-		n += 1 + sovAuction(uint64(m.NumProviders))
-	}
-	if m.FundsReleased {
-		n += 3
-	}
 	return n
 }
 
@@ -777,6 +800,171 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 			return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CommitsDuration", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuction
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuction
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuction
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.CommitsDuration, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field RevealsDuration", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuction
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuction
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuction
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.RevealsDuration, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CommitFee", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuction
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuction
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuction
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.CommitFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field RevealFee", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuction
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuction
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuction
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.RevealFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MinimumBid", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowAuction
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthAuction
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthAuction
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.MinimumBid.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipAuction(dAtA[iNdEx:])
@@ -860,38 +1048,6 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 			m.Id = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowAuction
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthAuction
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthAuction
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
 			}
@@ -923,7 +1079,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 			}
 			m.Status = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 4:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field OwnerAddress", wireType)
 			}
@@ -955,7 +1111,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 			}
 			m.OwnerAddress = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 5:
+		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CreateTime", wireType)
 			}
@@ -988,7 +1144,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 6:
+		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CommitsEndTime", wireType)
 			}
@@ -1021,7 +1177,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 7:
+		case 6:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field RevealsEndTime", wireType)
 			}
@@ -1054,7 +1210,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 8:
+		case 7:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CommitFee", wireType)
 			}
@@ -1087,7 +1243,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 9:
+		case 8:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field RevealFee", wireType)
 			}
@@ -1120,7 +1276,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 10:
+		case 9:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field MinimumBid", wireType)
 			}
@@ -1153,9 +1309,9 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 11:
+		case 10:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field WinnerAddresses", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field WinnerAddress", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1183,11 +1339,11 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.WinnerAddresses = append(m.WinnerAddresses, string(dAtA[iNdEx:postIndex]))
+			m.WinnerAddress = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 12:
+		case 11:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field WinningBids", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field WinningBid", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1214,12 +1370,11 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.WinningBids = append(m.WinningBids, types.Coin{})
+			if err := m.WinningBid.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-			if err := m.WinningBids[len(m.WinningBids)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
-		case 13:
+		case 12:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field WinningPrice", wireType)
 			}
@@ -1252,78 +1407,6 @@ func (m *Auction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 14:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowAuction
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthAuction
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthAuction
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.MaxPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 15:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType)
-			}
-			m.NumProviders = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowAuction
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.NumProviders |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 16:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field FundsReleased", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowAuction
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.FundsReleased = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipAuction(dAtA[iNdEx:])

x/auction/client/cli/tx.go

@@ -4,7 +4,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"os"
-	"strconv"
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -13,6 +12,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
 	wnsUtils "git.vdb.to/cerc-io/laconicd/utils"
 	auctiontypes "git.vdb.to/cerc-io/laconicd/x/auction"
@@ -48,16 +48,6 @@ func GetCmdCommitBid() *cobra.Command {
 				return err
 			}
 
-			// Take chain id passed by user
-			chainId, _ := cmd.Flags().GetString(flags.FlagChainID)
-			if chainId == "" {
-				// Take from config if not provided
-				chainId = clientCtx.ChainID
-			}
-			if chainId == "" {
-				return fmt.Errorf("--chain-id required")
-			}
-
 			bidAmount, err := sdk.ParseCoinNormalized(args[1])
 			if err != nil {
 				return err
@@ -68,6 +58,7 @@ func GetCmdCommitBid() *cobra.Command {
 				return err
 			}
 
+			chainId := viper.GetString("chain-id")
 			auctionId := args[0]
 
 			reveal := map[string]interface{}{
@@ -141,63 +132,48 @@ func GetCmdRevealBid() *cobra.Command {
 
 func GetCmdCreateAuction() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create [kind] [commits-duration] [reveals-duration] [commit-fee] [reveal-fee] [minimum-bid] [max-price] [num-providers]",
+		Use:   "create [commits-duration] [reveals-duration] [commit-fee] [reveal-fee] [minimum-bid]",
 		Short: "Create auction.",
-		Args:  cobra.ExactArgs(8),
+		Args:  cobra.ExactArgs(5),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			kind := args[0]
+			commitsDuration, err := time.ParseDuration(args[0])
-
-			commitsDuration, err := time.ParseDuration(args[1])
 			if err != nil {
 				return err
 			}
 
-			revealsDuration, err := time.ParseDuration(args[2])
+			revealsDuration, err := time.ParseDuration(args[1])
 			if err != nil {
 				return err
 			}
 
-			commitFee, err := sdk.ParseCoinNormalized(args[3])
+			commitFee, err := sdk.ParseCoinNormalized(args[2])
 			if err != nil {
 				return err
 			}
 
-			revealFee, err := sdk.ParseCoinNormalized(args[4])
+			revealFee, err := sdk.ParseCoinNormalized(args[3])
 			if err != nil {
 				return err
 			}
 
-			minimumBid, err := sdk.ParseCoinNormalized(args[5])
+			minimumBid, err := sdk.ParseCoinNormalized(args[4])
 			if err != nil {
 				return err
 			}
 
-			maxPrice, err := sdk.ParseCoinNormalized(args[6])
+			params := auctiontypes.Params{
-			if err != nil {
+				CommitsDuration: commitsDuration,
-				return err
+				RevealsDuration: revealsDuration,
+				CommitFee:       commitFee,
+				RevealFee:       revealFee,
+				MinimumBid:      minimumBid,
 			}
-
+			msg := auctiontypes.NewMsgCreateAuction(params, clientCtx.GetFromAddress())
-			numProviders, err := strconv.ParseInt(args[7], 10, 32)
-			if err != nil {
-				return err
-			}
-
-			msg := auctiontypes.NewMsgCreateAuction(
-				kind,
-				commitsDuration,
-				revealsDuration,
-				commitFee,
-				revealFee,
-				minimumBid,
-				maxPrice,
-				int32(numProviders),
-				clientCtx.GetFromAddress(),
-			)
 			err = msg.ValidateBasic()
 			if err != nil {
 				return err

x/auction/events.go

@@ -4,7 +4,6 @@ const (
 	EventTypeCreateAuction = "create-auction"
 	EventTypeCommitBid     = "commit-bid"
 	EventTypeRevealBid     = "reveal-bid"
-	EventTypeReleaseFunds  = "release-funds"
 
 	AttributeKeyCommitsDuration = "commits-duration"
 	AttributeKeyRevealsDuration = "reveals-duration"

x/auction/keeper/keeper.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"time"
 
 	"cosmossdk.io/collections"
@@ -13,7 +12,6 @@ import (
 	storetypes "cosmossdk.io/core/store"
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/log"
-	"cosmossdk.io/math"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -26,7 +24,7 @@ import (
 )
 
 // CompletedAuctionDeleteTimeout => Completed auctions are deleted after this timeout (after reveals end time).
-const CompletedAuctionDeleteTimeout = 365 * 24 * time.Hour // 1 year
+const CompletedAuctionDeleteTimeout = time.Hour * 24
 
 type AuctionsIndexes struct {
 	Owner *indexes.Multi[string, string, auctiontypes.Auction]
@@ -341,18 +339,8 @@ func (k Keeper) CreateAuction(ctx sdk.Context, msg auctiontypes.MsgCreateAuction
 	commitsEndTime := now.Add(msg.CommitsDuration)
 	revealsEndTime := now.Add(msg.CommitsDuration + msg.RevealsDuration)
 
-	if msg.Kind == auctiontypes.AuctionKindProvider {
-		totalLockedAmount := sdk.NewCoin(msg.MaxPrice.Denom, msg.MaxPrice.Amount.MulRaw(int64(msg.NumProviders)))
-
-		sdkErr := k.bankKeeper.SendCoinsFromAccountToModule(ctx, signerAddress, auctiontypes.ModuleName, sdk.NewCoins(totalLockedAmount))
-		if sdkErr != nil {
-			return nil, errorsmod.Wrap(sdkErr, "Auction error transferring maximum price amount")
-		}
-	}
-
 	auction := auctiontypes.Auction{
 		Id:             auctionId,
-		Kind:           msg.Kind,
 		Status:         auctiontypes.AuctionStatusCommitPhase,
 		OwnerAddress:   signerAddress.String(),
 		CreateTime:     now,
@@ -361,8 +349,6 @@ func (k Keeper) CreateAuction(ctx sdk.Context, msg auctiontypes.MsgCreateAuction
 		CommitFee:      msg.CommitFee,
 		RevealFee:      msg.RevealFee,
 		MinimumBid:     msg.MinimumBid,
-		MaxPrice:       msg.MaxPrice,
-		NumProviders:   msg.NumProviders,
 	}
 
 	// Save auction in store.
@@ -530,21 +516,15 @@ func (k Keeper) RevealBid(ctx sdk.Context, msg auctiontypes.MsgRevealBid) (*auct
 		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Invalid reveal bid amount.")
 	}
 
-	if auction.Kind == auctiontypes.AuctionKindVickrey && bidAmount.IsLT(auction.MinimumBid) {
+	if bidAmount.IsLT(auction.MinimumBid) {
 		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Bid is lower than minimum bid.")
 	}
 
-	if auction.Kind == auctiontypes.AuctionKindProvider && auction.MaxPrice.IsLT(bidAmount) {
-		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Bid is higher than max price.")
-	}
-
 	// Lock bid amount.
-	if auction.Kind == auctiontypes.AuctionKindVickrey {
 	sdkErr := k.bankKeeper.SendCoinsFromAccountToModule(ctx, signerAddress, auctiontypes.ModuleName, sdk.NewCoins(bidAmount))
 	if sdkErr != nil {
 		return nil, sdkErr
 	}
-	}
 
 	// Update bid.
 	bid.BidAmount = bidAmount
@@ -626,15 +606,9 @@ func (k Keeper) processAuctionPhases(ctx sdk.Context) error {
 
 		// If auction has expired, pick a winner from revealed bids.
 		if auction.Status == auctiontypes.AuctionStatusExpired {
-			if auction.Kind == auctiontypes.AuctionKindVickrey {
 			if err = k.pickAuctionWinner(ctx, auction); err != nil {
 				return err
 			}
-			} else {
-				if err = k.pickProviderAuctionWinners(ctx, auction); err != nil {
-					return err
-				}
-			}
 		}
 	}
 
@@ -661,7 +635,6 @@ func (k Keeper) deleteCompletedAuctions(ctx sdk.Context) error {
 	return nil
 }
 
-// Pick winner for vickrey auction
 func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction) error {
 	k.Logger(ctx).Info(fmt.Sprintf("Picking auction %s winner.", auction.Id))
 
@@ -713,17 +686,17 @@ func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction
 	auction.Status = auctiontypes.AuctionStatusCompleted
 
 	if highestBid != nil {
-		auction.WinningBids = []sdk.Coin{highestBid.BidAmount}
+		auction.WinnerAddress = highestBid.BidderAddress
-		auction.WinnerAddresses = []string{highestBid.BidderAddress}
+		auction.WinningBid = highestBid.BidAmount
 
 		// Winner pays 2nd price, if a 2nd price exists.
 		auction.WinningPrice = highestBid.BidAmount
 		if secondHighestBid != nil {
 			auction.WinningPrice = secondHighestBid.BidAmount
 		}
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner %s.", auction.Id, auction.WinnerAddresses[0]))
+		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner %s.", auction.Id, auction.WinnerAddress))
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner bid %s.", auction.Id, auction.WinningBids[0].String()))
+		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner bid %s.", auction.Id, auction.WinningBid.String()))
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winning price %s.", auction.Id, auction.WinningPrice.String()))
+		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner price %s.", auction.Id, auction.WinningPrice.String()))
 	} else {
 		k.Logger(ctx).Info(fmt.Sprintf("Auction %s has no valid revealed bids (no winner).", auction.Id))
 	}
@@ -757,8 +730,8 @@ func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction
 	}
 
 	// Process winner account (if nobody bids, there won't be a winner).
-	if len(auction.WinnerAddresses) != 0 {
+	if auction.WinnerAddress != "" {
-		winnerAddress, err := sdk.AccAddressFromBech32(auction.WinnerAddresses[0])
+		winnerAddress, err := sdk.AccAddressFromBech32(auction.WinnerAddress)
 		if err != nil {
 			k.Logger(ctx).Error(fmt.Sprintf("Invalid winner address. %v", err))
 			panic("Invalid winner address.")
@@ -800,173 +773,3 @@ func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction
 
 	return nil
 }
-
-// Pick winner for provider auction
-func (k Keeper) pickProviderAuctionWinners(ctx sdk.Context, auction *auctiontypes.Auction) error {
-	k.Logger(ctx).Info(fmt.Sprintf("Picking auction %s winners.", auction.Id))
-
-	bids, err := k.GetBids(ctx, auction.Id)
-	if err != nil {
-		return err
-	}
-
-	revealedBids := make([]*auctiontypes.Bid, 0, len(bids))
-	for _, bid := range bids {
-		k.Logger(ctx).Info(fmt.Sprintf("Processing bid %s %s", bid.BidderAddress, bid.BidAmount.String()))
-
-		// Only consider revealed bids.
-		if bid.Status != auctiontypes.BidStatusRevealed {
-			k.Logger(ctx).Info(fmt.Sprintf("Ignoring unrevealed bid %s %s", bid.BidderAddress, bid.BidAmount.String()))
-			continue
-		}
-
-		revealedBids = append(revealedBids, bid)
-	}
-
-	// Sort the valid bids
-	slices.SortStableFunc(revealedBids, func(a, b *auctiontypes.Bid) int {
-		if a.BidAmount.Amount.LT(b.BidAmount.Amount) {
-			return -1
-		} else if a.BidAmount.Amount.GT(b.BidAmount.Amount) {
-			return 1
-		}
-		return 0
-	})
-
-	// Take best min(len(revealedBids), auction.NumProviders) bids
-	numWinners := int(auction.NumProviders)
-	if len(revealedBids) < numWinners {
-		numWinners = len(revealedBids)
-	}
-	winnerBids := revealedBids[:numWinners]
-
-	auction.Status = auctiontypes.AuctionStatusCompleted
-
-	if len(winnerBids) > 0 {
-		winnerAddresses := make([]string, len(winnerBids))
-		winningBids := make([]sdk.Coin, len(winnerBids))
-		for i, bid := range winnerBids {
-			winnerAddresses[i] = bid.BidderAddress
-			winningBids[i] = bid.BidAmount
-		}
-
-		auction.WinnerAddresses = winnerAddresses
-		auction.WinningBids = winningBids
-
-		// The last best bid is the winning price
-		auction.WinningPrice = winnerBids[len(winnerBids)-1].BidAmount
-
-		for _, bid := range winnerBids {
-			k.Logger(ctx).Info(fmt.Sprintf("Auction %s winner address: %s, bid amount: %s.", auction.Id, bid.BidderAddress, bid.BidAmount.String()))
-		}
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s winning price %s.", auction.Id, auction.WinningPrice.String()))
-	} else {
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s has no valid revealed bids (no winner).", auction.Id))
-	}
-
-	if err := k.SaveAuction(ctx, auction); err != nil {
-		return err
-	}
-
-	for _, bid := range bids {
-		bidderAddress, err := sdk.AccAddressFromBech32(bid.BidderAddress)
-		if err != nil {
-			k.Logger(ctx).Error(fmt.Sprintf("Invalid bidderAddress address. %v", err))
-			panic("Invalid bidder address.")
-		}
-
-		if bid.Status == auctiontypes.BidStatusRevealed {
-			// Send reveal fee back to bidders that've revealed the bid.
-			sdkErr := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, auctiontypes.ModuleName, bidderAddress, sdk.NewCoins(bid.RevealFee))
-			if sdkErr != nil {
-				k.Logger(ctx).Error(fmt.Sprintf("Auction error returning reveal fee: %v", sdkErr))
-				panic(sdkErr)
-			}
-		}
-	}
-
-	// Send back any leftover locked amount to auction creator
-	// All of it in case of no winners
-	totalLockedAmount := auction.MaxPrice.Amount.Mul(math.NewInt(int64(auction.NumProviders)))
-	totalAmountPaid := auction.WinningPrice.Amount.Mul(math.NewInt(int64(len(auction.WinnerAddresses))))
-	creatorLeftOverAmount := sdk.NewCoin(auction.MaxPrice.Denom, totalLockedAmount.Sub(totalAmountPaid))
-
-	ownerAccAddress, err := sdk.AccAddressFromBech32(auction.OwnerAddress)
-	if err != nil {
-		k.Logger(ctx).Error(fmt.Sprintf("Invalid auction owner address. %v", err))
-		panic("Invalid auction owner address.")
-	}
-
-	sdkErr := k.bankKeeper.SendCoinsFromModuleToAccount(
-		ctx,
-		auctiontypes.ModuleName,
-		ownerAccAddress,
-		sdk.NewCoins(creatorLeftOverAmount),
-	)
-	if sdkErr != nil {
-		k.Logger(ctx).Error(fmt.Sprintf("Auction error returning leftover locked amount: %v", sdkErr))
-		panic(sdkErr)
-	}
-
-	// Notify other modules (hook).
-	k.Logger(ctx).Info(fmt.Sprintf("Auction %s notifying %d modules.", auction.Id, len(k.usageKeepers)))
-	for _, keeper := range k.usageKeepers {
-		k.Logger(ctx).Info(fmt.Sprintf("Auction %s notifying module %s.", auction.Id, keeper.ModuleName()))
-		keeper.OnAuctionWinnerSelected(ctx, auction.Id)
-	}
-
-	return nil
-}
-
-func (k Keeper) ReleaseFunds(ctx sdk.Context, msg auctiontypes.MsgReleaseFunds) (*auctiontypes.Auction, error) {
-	auction, err := k.GetAuctionById(ctx, msg.AuctionId)
-	if err != nil {
-		return nil, err
-	}
-
-	if auction.Kind != auctiontypes.AuctionKindProvider {
-		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Auction kind must be provider.")
-	}
-
-	// Only the auction owner can release funds.
-	if msg.Signer != auction.OwnerAddress {
-		return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, "Only auction owner can release funds.")
-	}
-
-	if auction.Status != auctiontypes.AuctionStatusCompleted {
-		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Auction is not completed.")
-	}
-
-	if auction.FundsReleased {
-		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Auction funds already released.")
-	}
-
-	// Mark funds as released in the stored auction
-	auction.FundsReleased = true
-	if err = k.SaveAuction(ctx, &auction); err != nil {
-		return nil, err
-	}
-
-	// Process winner accounts.
-	for _, winnerAddress := range auction.WinnerAddresses {
-		winnerAccAddress, err := sdk.AccAddressFromBech32(winnerAddress)
-		if err != nil {
-			k.Logger(ctx).Error(fmt.Sprintf("Invalid winner address. %v", err))
-			panic("Invalid winner address.")
-		}
-
-		// Send winning price to winning bidders
-		sdkErr := k.bankKeeper.SendCoinsFromModuleToAccount(
-			ctx,
-			auctiontypes.ModuleName,
-			winnerAccAddress,
-			sdk.NewCoins(auction.WinningPrice),
-		)
-		if sdkErr != nil {
-			k.Logger(ctx).Error(fmt.Sprintf("Auction error sending funds to winner: %v", sdkErr))
-			panic(sdkErr)
-		}
-	}
-
-	return &auction, err
-}

x/auction/keeper/msg_server.go

@@ -56,6 +56,7 @@ func (ms msgServer) CreateAuction(c context.Context, msg *auctiontypes.MsgCreate
 }
 
 // CommitBid is the command for committing a bid
+// nolint: all
 func (ms msgServer) CommitBid(c context.Context, msg *auctiontypes.MsgCommitBid) (*auctiontypes.MsgCommitBidResponse, error) {
 	if err := msg.ValidateBasic(); err != nil {
 		return nil, err
@@ -93,6 +94,7 @@ func (ms msgServer) CommitBid(c context.Context, msg *auctiontypes.MsgCommitBid)
 }
 
 // RevealBid is the command for revealing a bid
+// nolint: all
 func (ms msgServer) RevealBid(c context.Context, msg *auctiontypes.MsgRevealBid) (*auctiontypes.MsgRevealBidResponse, error) {
 	if err := msg.ValidateBasic(); err != nil {
 		return nil, err
@@ -147,39 +149,3 @@ func (ms msgServer) UpdateParams(c context.Context, msg *auctiontypes.MsgUpdateP
 
 	return &auctiontypes.MsgUpdateParamsResponse{}, nil
 }
-
-// ReleaseFunds is the command to pay the winning amounts to provider auction winners
-func (ms msgServer) ReleaseFunds(c context.Context, msg *auctiontypes.MsgReleaseFunds) (*auctiontypes.MsgReleaseFundsResponse, error) {
-	if err := msg.ValidateBasic(); err != nil {
-		return nil, err
-	}
-
-	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
-	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := ms.k.ReleaseFunds(ctx, *msg)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx.EventManager().EmitEvents(sdk.Events{
-		sdk.NewEvent(
-			auctiontypes.EventTypeReleaseFunds,
-			sdk.NewAttribute(auctiontypes.AttributeKeyAuctionId, msg.AuctionId),
-		),
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, auctiontypes.AttributeValueCategory),
-			sdk.NewAttribute(auctiontypes.AttributeKeySigner, signerAddress.String()),
-		),
-	})
-
-	utils.LogTxGasConsumed(ctx, ms.k.Logger(ctx), "ReleaseFunds")
-
-	return &auctiontypes.MsgReleaseFundsResponse{Auction: resp}, nil
-}

x/auction/module/autocli.go

@@ -81,19 +81,14 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 			RpcCommandOptions: []*autocliv1.RpcCommandOptions{
 				{
 					RpcMethod: "CreateAuction",
-					Use:       "create [commits-duration] [reveals-duration] [commit-fee] [reveal-fee]",
+					Use:       "create [commits-duration] [reveals-duration] [commit-fee] [reveal-fee] [minimum-bid]",
 					Short:     "Create an auction",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{
 						{ProtoField: "commits_duration"},
 						{ProtoField: "reveals_duration"},
 						{ProtoField: "commit_fee"},
 						{ProtoField: "reveal_fee"},
-					},
+						{ProtoField: "minimum_bid"},
-					FlagOptions: map[string]*autocliv1.FlagOptions{
-						"kind":          {Name: "kind", DefaultValue: "vickrey", Usage: "Auction kind (vickrey|provider) (default: vickrey)"},
-						"minimum_bid":   {Name: "minimum-bid", Usage: "Minimum bid (required for vickrey auctions)"},
-						"max_price":     {Name: "max-price", Usage: "Max price (required for provider auctions)"},
-						"num_providers": {Name: "num-providers", Usage: "Number of desired providers (required for provider auctions)"},
 					},
 				},
 				{

x/auction/msgs.go

@@ -1,9 +1,6 @@
 package auction
 
 import (
-	"fmt"
-	time "time"
-
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -16,26 +13,13 @@ var (
 )
 
 // NewMsgCreateAuction is the constructor function for MsgCreateAuction.
-func NewMsgCreateAuction(
+func NewMsgCreateAuction(params Params, signer sdk.AccAddress) MsgCreateAuction {
-	kind string,
-	commitsDuration time.Duration,
-	revealsDuration time.Duration,
-	commitFee sdk.Coin,
-	revealFee sdk.Coin,
-	minimumBid sdk.Coin,
-	maxPrice sdk.Coin,
-	numProviders int32,
-	signer sdk.AccAddress,
-) MsgCreateAuction {
 	return MsgCreateAuction{
-		CommitsDuration: commitsDuration,
+		CommitsDuration: params.CommitsDuration,
-		RevealsDuration: revealsDuration,
+		RevealsDuration: params.RevealsDuration,
-		CommitFee:       commitFee,
+		CommitFee:       params.CommitFee,
-		RevealFee:       revealFee,
+		RevealFee:       params.RevealFee,
-		MinimumBid:      minimumBid,
+		MinimumBid:      params.MinimumBid,
-		MaxPrice:        maxPrice,
-		Kind:            kind,
-		NumProviders:    numProviders,
 		Signer:          signer.String(),
 	}
 }
@@ -49,53 +33,22 @@ func NewMsgCommitBid(auctionId string, commitHash string, signer sdk.AccAddress)
 	}
 }
 
-// NewMsgRevealBid is the constructor function for MsgRevealBid.
-func NewMsgRevealBid(auctionId string, reveal string, signer sdk.AccAddress) MsgRevealBid {
-	return MsgRevealBid{
-		AuctionId: auctionId,
-		Reveal:    reveal,
-		Signer:    signer.String(),
-	}
-}
-
-// NewMsgReleaseFunds is the constructor function for MsgReleaseFunds.
-func NewMsgReleaseFunds(auctionId string, signer sdk.AccAddress) MsgReleaseFunds {
-	return MsgReleaseFunds{
-		AuctionId: auctionId,
-		Signer:    signer.String(),
-	}
-}
-
 // ValidateBasic Implements Msg.
 func (msg MsgCreateAuction) ValidateBasic() error {
 	if msg.Signer == "" {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidAddress, msg.Signer)
 	}
 
-	if msg.Kind != AuctionKindVickrey && msg.Kind != AuctionKindProvider {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("auction kind should be one of %s | %s", AuctionKindVickrey, AuctionKindProvider))
-	}
-
 	if msg.CommitsDuration <= 0 {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "commit phase duration invalid")
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "commit phase duration invalid.")
 	}
 
 	if msg.RevealsDuration <= 0 {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "reveal phase duration invalid")
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "reveal phase duration invalid.")
 	}
 
-	if msg.Kind == AuctionKindVickrey && !msg.MinimumBid.IsPositive() {
+	if !msg.MinimumBid.IsPositive() {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("minimum bid should be greater than zero for %s auction", AuctionKindVickrey))
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "minimum bid should be greater than zero.")
-	}
-
-	if msg.Kind == AuctionKindProvider {
-		if !msg.MaxPrice.IsPositive() {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("max price should be greater than zero for %s auction", AuctionKindProvider))
-		}
-
-		if msg.NumProviders <= 0 {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, fmt.Sprintf("num providers should be greater than zero for %s auction", AuctionKindProvider))
-		}
 	}
 
 	return nil
@@ -118,6 +71,15 @@ func (msg MsgCommitBid) ValidateBasic() error {
 	return nil
 }
 
+// NewMsgRevealBid is the constructor function for MsgRevealBid.
+func NewMsgRevealBid(auctionId string, reveal string, signer sdk.AccAddress) MsgRevealBid {
+	return MsgRevealBid{
+		AuctionId: auctionId,
+		Reveal:    reveal,
+		Signer:    signer.String(),
+	}
+}
+
 // ValidateBasic Implements Msg.
 func (msg MsgRevealBid) ValidateBasic() error {
 	if msg.Signer == "" {
@@ -134,16 +96,3 @@ func (msg MsgRevealBid) ValidateBasic() error {
 
 	return nil
 }
-
-// ValidateBasic Implements Msg.
-func (msg MsgReleaseFunds) ValidateBasic() error {
-	if msg.Signer == "" {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidAddress, "invalid signer address")
-	}
-
-	if msg.AuctionId == "" {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid auction id")
-	}
-
-	return nil
-}

x/auction/params.go

@@ -1,11 +1,143 @@
 package auction
 
+import (
+	"errors"
+	fmt "fmt"
+	"strings"
+	time "time"
+
+	sdkmath "cosmossdk.io/math"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+var (
+	DefaultCommitsDuration = 5 * time.Minute
+	DefaultRevealsDuration = 5 * time.Minute
+
+	DefaultCommitFee  = sdkmath.NewInt(1000)    // 10^3 alnt
+	DefaultRevealFee  = sdkmath.NewInt(1000)    // 10^3 alnt
+	DefaultMinimumBid = sdkmath.NewInt(1000000) // 10^6 alnt
+)
+
+func NewParams(commitsDuration time.Duration, revealsDuration time.Duration, commitFee sdk.Coin, revealFee sdk.Coin, minimumBid sdk.Coin) Params {
+	return Params{
+		CommitsDuration: commitsDuration,
+		RevealsDuration: revealsDuration,
+		CommitFee:       commitFee,
+		RevealFee:       revealFee,
+		MinimumBid:      minimumBid,
+	}
+}
+
 // DefaultParams returns a default set of parameters.
 func DefaultParams() Params {
-	return Params{}
+	return Params{
+		CommitsDuration: DefaultCommitsDuration,
+		RevealsDuration: DefaultRevealsDuration,
+		CommitFee:       sdk.NewCoin(sdk.DefaultBondDenom, DefaultCommitFee),
+		RevealFee:       sdk.NewCoin(sdk.DefaultBondDenom, DefaultRevealFee),
+		MinimumBid:      sdk.NewCoin(sdk.DefaultBondDenom, DefaultMinimumBid),
+	}
+}
+
+// String returns a human readable string representation of the parameters.
+func (p Params) String() string {
+	var sb strings.Builder
+	sb.WriteString("Params: \n")
+	sb.WriteString(fmt.Sprintf("CommitsDuration: %s\n", p.CommitsDuration.String()))
+	sb.WriteString(fmt.Sprintf("RevealsDuration: %s\n", p.RevealsDuration.String()))
+	sb.WriteString(fmt.Sprintf("CommitFee: %s\n", p.CommitFee.String()))
+	sb.WriteString(fmt.Sprintf("RevealFee: %s\n", p.RevealFee.String()))
+	sb.WriteString(fmt.Sprintf("MinimumBid: %s\n", p.MinimumBid.String()))
+	return sb.String()
 }
 
 // Validate a set of params.
 func (p Params) Validate() error {
+	if err := validateCommitsDuration(p.CommitsDuration); err != nil {
+		return err
+	}
+
+	if err := validateRevealsDuration(p.RevealsDuration); err != nil {
+		return err
+	}
+
+	if err := validateCommitFee(p.CommitFee); err != nil {
+		return err
+	}
+
+	if err := validateRevealFee(p.RevealFee); err != nil {
+		return err
+	}
+
+	if err := validateMinimumBid(p.MinimumBid); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func validateCommitsDuration(i interface{}) error {
+	v, ok := i.(time.Duration)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if v < 0 {
+		return errors.New("commits duration cannot be negative")
+	}
+
+	return nil
+}
+
+func validateRevealsDuration(i interface{}) error {
+	v, ok := i.(time.Duration)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if v < 0 {
+		return errors.New("reveals duration cannot be negative")
+	}
+
+	return nil
+}
+
+func validateCommitFee(i interface{}) error {
+	v, ok := i.(sdk.Coin)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if v.Amount.IsNegative() {
+		return errors.New("commit fee must be positive")
+	}
+
+	return nil
+}
+
+func validateRevealFee(i interface{}) error {
+	v, ok := i.(sdk.Coin)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if v.Amount.IsNegative() {
+		return errors.New("reveal fee must be positive")
+	}
+
+	return nil
+}
+
+func validateMinimumBid(i interface{}) error {
+	v, ok := i.(sdk.Coin)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if v.Amount.IsNegative() {
+		return errors.New("minimum bid must be positive")
+	}
+
 	return nil
 }

x/auction/tx.pb.go

@@ -38,27 +38,18 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // MsgCreateAuction defines a create auction message
 type MsgCreateAuction struct {
-	// Address of the signer
-	Signer string `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty" json:"signer" yaml:"signer"`
-	// Auction kind (vickrey | provider)
-	Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"`
 	// Duration of the commits phase in seconds
-	CommitsDuration time.Duration `protobuf:"bytes,3,opt,name=commits_duration,json=commitsDuration,proto3,stdduration" json:"commits_duration" json:"commits_duration" yaml:"commits_duration"`
+	CommitsDuration time.Duration `protobuf:"bytes,1,opt,name=commits_duration,json=commitsDuration,proto3,stdduration" json:"commits_duration" json:"commits_duration" yaml:"commits_duration"`
 	// Duration of the reveals phase in seconds
-	RevealsDuration time.Duration `protobuf:"bytes,4,opt,name=reveals_duration,json=revealsDuration,proto3,stdduration" json:"reveals_duration" json:"reveals_duration" yaml:"reveals_duration"`
+	RevealsDuration time.Duration `protobuf:"bytes,2,opt,name=reveals_duration,json=revealsDuration,proto3,stdduration" json:"reveals_duration" json:"reveals_duration" yaml:"reveals_duration"`
 	// Commit fees
-	CommitFee types.Coin `protobuf:"bytes,5,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"`
+	CommitFee types.Coin `protobuf:"bytes,3,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"`
 	// Reveal fees
-	RevealFee types.Coin `protobuf:"bytes,6,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"`
+	RevealFee types.Coin `protobuf:"bytes,4,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"`
 	// Minimum acceptable bid amount
-	// Only applicable in vickrey auctions
+	MinimumBid types.Coin `protobuf:"bytes,5,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"`
-	MinimumBid types.Coin `protobuf:"bytes,7,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"`
+	// Address of the signer
-	// Maximum acceptable bid amount
+	Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty" json:"signer" yaml:"signer"`
-	// Only applicable in provider auctions
-	MaxPrice types.Coin `protobuf:"bytes,8,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"`
-	// Number of desired providers (num of auction winners)
-	// Only applicable in provider auctions
-	NumProviders int32 `protobuf:"varint,9,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"`
 }
 
 func (m *MsgCreateAuction) Reset()         { *m = MsgCreateAuction{} }
@@ -393,87 +384,6 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo
 
-// ReleaseFunds defines the message to pay the winners of provider auctions
-type MsgReleaseFunds struct {
-	// Auction id
-	AuctionId string `protobuf:"bytes,1,opt,name=auction_id,json=auctionId,proto3" json:"auction_id,omitempty" json:"auction_id" yaml:"auction_id"`
-	// Address of the signer
-	Signer string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty" json:"signer" yaml:"signer"`
-}
-
-func (m *MsgReleaseFunds) Reset()         { *m = MsgReleaseFunds{} }
-func (m *MsgReleaseFunds) String() string { return proto.CompactTextString(m) }
-func (*MsgReleaseFunds) ProtoMessage()    {}
-func (*MsgReleaseFunds) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70947cda59e835fd, []int{8}
-}
-func (m *MsgReleaseFunds) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *MsgReleaseFunds) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_MsgReleaseFunds.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *MsgReleaseFunds) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgReleaseFunds.Merge(m, src)
-}
-func (m *MsgReleaseFunds) XXX_Size() int {
-	return m.Size()
-}
-func (m *MsgReleaseFunds) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgReleaseFunds.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgReleaseFunds proto.InternalMessageInfo
-
-// MsgReleaseFundsResponse returns the state of the auction after releasing the
-// funds
-type MsgReleaseFundsResponse struct {
-	// Auction details
-	Auction *Auction `protobuf:"bytes,1,opt,name=auction,proto3" json:"auction,omitempty" json:"auction" yaml:"auction"`
-}
-
-func (m *MsgReleaseFundsResponse) Reset()         { *m = MsgReleaseFundsResponse{} }
-func (m *MsgReleaseFundsResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgReleaseFundsResponse) ProtoMessage()    {}
-func (*MsgReleaseFundsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_70947cda59e835fd, []int{9}
-}
-func (m *MsgReleaseFundsResponse) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *MsgReleaseFundsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_MsgReleaseFundsResponse.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *MsgReleaseFundsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgReleaseFundsResponse.Merge(m, src)
-}
-func (m *MsgReleaseFundsResponse) XXX_Size() int {
-	return m.Size()
-}
-func (m *MsgReleaseFundsResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgReleaseFundsResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgReleaseFundsResponse proto.InternalMessageInfo
-
 func init() {
 	proto.RegisterType((*MsgCreateAuction)(nil), "cerc.auction.v1.MsgCreateAuction")
 	proto.RegisterType((*MsgCreateAuctionResponse)(nil), "cerc.auction.v1.MsgCreateAuctionResponse")
@@ -483,78 +393,67 @@ func init() {
 	proto.RegisterType((*MsgRevealBidResponse)(nil), "cerc.auction.v1.MsgRevealBidResponse")
 	proto.RegisterType((*MsgUpdateParams)(nil), "cerc.auction.v1.MsgUpdateParams")
 	proto.RegisterType((*MsgUpdateParamsResponse)(nil), "cerc.auction.v1.MsgUpdateParamsResponse")
-	proto.RegisterType((*MsgReleaseFunds)(nil), "cerc.auction.v1.MsgReleaseFunds")
-	proto.RegisterType((*MsgReleaseFundsResponse)(nil), "cerc.auction.v1.MsgReleaseFundsResponse")
 }
 
 func init() { proto.RegisterFile("cerc/auction/v1/tx.proto", fileDescriptor_70947cda59e835fd) }
 
 var fileDescriptor_70947cda59e835fd = []byte{
-	// 1025 bytes of a gzipped FileDescriptorProto
+	// 881 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0x8f, 0xdb, 0x34, 0xbb, 0x99, 0x74, 0xe9, 0xca, 0x2a, 0xaa, 0x9b, 0xd2, 0x38, 0x75, 0x55,
+	0x14, 0x5e, 0x77, 0x93, 0x45, 0x3b, 0x29, 0xa4, 0xb2, 0x82, 0xe2, 0x6c, 0xc9, 0x3a, 0x71, 0x15,
-	0xb6, 0x5d, 0x54, 0x5b, 0x0d, 0x82, 0x95, 0xca, 0x01, 0x35, 0x8b, 0x2a, 0x40, 0xaa, 0x54, 0x19,
+	0x35, 0x2d, 0x8a, 0xad, 0x04, 0x41, 0xa5, 0x70, 0x40, 0x71, 0x51, 0x05, 0x48, 0x91, 0x90, 0x51,
-	0xed, 0x65, 0x2f, 0xd1, 0xc4, 0x9e, 0xba, 0x03, 0xb1, 0x1d, 0x79, 0x9c, 0xd0, 0xbd, 0x41, 0x0f,
+	0x2f, 0xbd, 0xac, 0xc6, 0xf6, 0xd4, 0x3b, 0x68, 0xed, 0x59, 0x79, 0xbc, 0x4b, 0x7b, 0x83, 0x1e,
-	0x88, 0xe3, 0x4a, 0x5c, 0x38, 0x22, 0xf1, 0x05, 0xf6, 0xc0, 0x87, 0xd8, 0xe3, 0x0a, 0x24, 0x04,
+	0x10, 0xc7, 0x4a, 0x5c, 0xb8, 0x20, 0xf1, 0x13, 0x7a, 0xe0, 0x47, 0xf4, 0x58, 0xc1, 0x05, 0x2e,
-	0x97, 0x80, 0x5a, 0xc4, 0x5e, 0x38, 0xe5, 0x13, 0xa0, 0x99, 0x79, 0xfe, 0x13, 0x27, 0xda, 0xaa,
+	0x0b, 0x24, 0x48, 0xbd, 0x70, 0xda, 0x5f, 0x80, 0x66, 0xe6, 0xcd, 0xda, 0xeb, 0x5d, 0x35, 0xaa,
-	0xda, 0x6a, 0x6f, 0x9e, 0xf7, 0xef, 0xf7, 0xde, 0xef, 0xbd, 0x37, 0x1e, 0xa4, 0x39, 0x24, 0x72,
+	0x88, 0xb8, 0xed, 0x7b, 0xdf, 0x9b, 0xf7, 0x7d, 0xef, 0xf3, 0x1b, 0x7b, 0x91, 0x15, 0x91, 0x3c,
-	0x2c, 0x3c, 0x70, 0x62, 0x1a, 0x06, 0xd6, 0x70, 0xcf, 0x8a, 0xcf, 0xcc, 0x7e, 0x14, 0xc6, 0xa1,
+	0xf2, 0xf0, 0x28, 0x2a, 0x28, 0xcb, 0xbc, 0xf1, 0xa1, 0x57, 0x3c, 0x72, 0x87, 0x39, 0x2b, 0x98,
-	0xba, 0xc4, 0x35, 0x26, 0x68, 0xcc, 0xe1, 0x5e, 0x7d, 0xc5, 0x09, 0x99, 0x1f, 0x32, 0xcb, 0x67,
+	0xb9, 0x2e, 0x10, 0x17, 0x10, 0x77, 0x7c, 0xd8, 0xd9, 0x8c, 0x18, 0x4f, 0x19, 0xf7, 0x52, 0x9e,
-	0x1e, 0x37, 0xf4, 0x99, 0x27, 0x2d, 0xeb, 0xcb, 0x5e, 0xe8, 0x85, 0xe2, 0xd3, 0xe2, 0x5f, 0x20,
+	0x88, 0xc2, 0x94, 0x27, 0xaa, 0xb2, 0xb3, 0x91, 0xb0, 0x84, 0xc9, 0x9f, 0x9e, 0xf8, 0x05, 0xd9,
-	0x7d, 0xc7, 0x0b, 0x43, 0xaf, 0x47, 0x2c, 0xdc, 0xa7, 0x16, 0x0e, 0x82, 0x30, 0xc6, 0x3c, 0x10,
+	0x77, 0x12, 0xc6, 0x92, 0x01, 0xf1, 0xf0, 0x90, 0x7a, 0x38, 0xcb, 0x58, 0x81, 0x45, 0x23, 0x0e,
-	0x03, 0x6d, 0x03, 0xb4, 0xe2, 0xd4, 0x1d, 0x9c, 0x58, 0xee, 0x20, 0x12, 0x06, 0x89, 0x1e, 0xc0,
+	0x68, 0x17, 0x50, 0x19, 0x85, 0xa3, 0x87, 0x5e, 0x3c, 0xca, 0x65, 0x81, 0xc6, 0x81, 0x2c, 0xc4,
-	0xba, 0x98, 0x11, 0x6b, 0xb8, 0xd7, 0x25, 0x31, 0xde, 0xb3, 0x9c, 0x90, 0x26, 0xfa, 0x55, 0xa9,
+	0x9c, 0x78, 0xe3, 0xc3, 0x90, 0x14, 0xf8, 0xd0, 0x8b, 0x18, 0xd5, 0xf8, 0x96, 0xc2, 0x7b, 0x8a,
-	0xef, 0x48, 0x58, 0x79, 0x00, 0xd5, 0x7a, 0xb1, 0xa4, 0xa4, 0x06, 0xa1, 0x36, 0x7e, 0xaf, 0xa0,
+	0x56, 0x05, 0x00, 0x6d, 0xd7, 0x47, 0xd2, 0x33, 0x48, 0xd8, 0xf9, 0x71, 0x15, 0x5d, 0x3b, 0xe5,
-	0xbb, 0x47, 0xcc, 0x7b, 0x18, 0x11, 0x1c, 0x93, 0x03, 0xa9, 0x52, 0x1f, 0xa0, 0x0a, 0xa3, 0x5e,
+	0xc9, 0xdd, 0x9c, 0xe0, 0x82, 0x9c, 0x28, 0xc8, 0xfc, 0xc6, 0x40, 0xd7, 0x22, 0x96, 0xa6, 0xb4,
-	0x40, 0x22, 0x4d, 0x69, 0x2a, 0xdb, 0xd5, 0xb6, 0x3e, 0x1e, 0xe9, 0x6b, 0x5f, 0xb2, 0x30, 0xd8,
+	0xe0, 0x3d, 0xad, 0xc4, 0x32, 0x76, 0x8c, 0xfd, 0xb5, 0xa3, 0x2d, 0x57, 0x49, 0x75, 0xb5, 0x54,
-	0x37, 0xa4, 0xdc, 0x68, 0x3e, 0xc1, 0x7e, 0x2f, 0x3d, 0xd9, 0x60, 0xae, 0x5a, 0xa8, 0xfc, 0x15,
+	0xf7, 0x63, 0x28, 0xf0, 0x3f, 0x7c, 0x3e, 0xb1, 0x1b, 0xd3, 0x89, 0xed, 0x7d, 0xc9, 0x59, 0x76,
-	0x0d, 0x5c, 0x6d, 0x4e, 0xb8, 0xad, 0x8d, 0x47, 0xfa, 0x8a, 0x74, 0xe3, 0xd2, 0xc4, 0x49, 0x7c,
+	0xec, 0xd4, 0x1b, 0x38, 0x3b, 0x8f, 0x71, 0x3a, 0x58, 0x92, 0xff, 0xe1, 0x0f, 0xdb, 0x08, 0xd6,
-	0xdb, 0xc2, 0x50, 0xfd, 0x56, 0x41, 0x77, 0x9d, 0xd0, 0xf7, 0x69, 0xcc, 0x3a, 0x49, 0xcd, 0xda,
+	0x21, 0xad, 0xbb, 0x49, 0x0d, 0x39, 0x19, 0x13, 0x3c, 0xa8, 0x68, 0xb8, 0xf2, 0x9a, 0x1a, 0xea,
-	0x7c, 0x53, 0xd9, 0xae, 0xb5, 0x56, 0x4d, 0x49, 0x8a, 0x99, 0x90, 0x62, 0x7e, 0x02, 0x06, 0xed,
+	0x0d, 0xb4, 0x86, 0x85, 0xbc, 0xd2, 0x00, 0xe9, 0x99, 0x06, 0x82, 0x90, 0x92, 0xd5, 0x7b, 0x48,
-	0x8f, 0x9e, 0x8f, 0xf4, 0xd2, 0x78, 0xa4, 0x5b, 0x32, 0x78, 0x31, 0x40, 0x02, 0x34, 0x25, 0xff,
+	0x88, 0xd5, 0x04, 0x72, 0xb0, 0x57, 0x3c, 0x0b, 0x17, 0x9e, 0x85, 0x7b, 0x97, 0xd1, 0xcc, 0x7f,
-	0xf1, 0x2f, 0x5d, 0xb1, 0x97, 0x40, 0x9c, 0x44, 0x13, 0x39, 0x44, 0x64, 0x48, 0x70, 0x2f, 0x97,
+	0x17, 0xc8, 0x6f, 0x54, 0x0d, 0x10, 0x47, 0xe7, 0x47, 0x97, 0x99, 0xa0, 0xad, 0x82, 0x7b, 0x84,
-	0x43, 0xf9, 0x9a, 0x39, 0x14, 0x03, 0x24, 0x39, 0x4c, 0xc9, 0x65, 0x0e, 0x20, 0x4e, 0x73, 0x20,
+	0x08, 0x1a, 0xc5, 0x2c, 0x69, 0x56, 0x5e, 0x93, 0xa6, 0x3c, 0x3a, 0x3f, 0x1d, 0xd0, 0xa8, 0x40,
-	0x08, 0xc9, 0xb4, 0x3a, 0x27, 0x84, 0x68, 0x0b, 0x00, 0x0e, 0x8d, 0xe4, 0x5d, 0x37, 0xa1, 0xeb,
+	0xd0, 0x50, 0xb4, 0x96, 0xd2, 0x8c, 0xa6, 0xa3, 0xb4, 0x17, 0xd2, 0xd8, 0x5a, 0xbd, 0x88, 0xe7,
-	0xe6, 0xc3, 0x90, 0x06, 0xed, 0xf7, 0x00, 0x7c, 0x33, 0x4f, 0x00, 0x77, 0x9d, 0x2c, 0x5d, 0x48,
+	0x00, 0x78, 0xf6, 0x14, 0x4f, 0xe5, 0xac, 0x26, 0xaa, 0xa6, 0x02, 0x04, 0x91, 0x4f, 0x63, 0xf3,
-	0xec, 0xaa, 0x3c, 0x1c, 0x12, 0xc2, 0x61, 0x24, 0xb2, 0x80, 0xa9, 0x5c, 0x13, 0x26, 0x73, 0x9d,
+	0x0e, 0x6a, 0x71, 0x9a, 0x64, 0x24, 0xb7, 0x5a, 0x3b, 0xc6, 0x7e, 0xdb, 0xb7, 0xa7, 0x13, 0xfb,
-	0xac, 0x0e, 0x60, 0xe4, 0x81, 0xc3, 0x50, 0x54, 0xf3, 0x69, 0x40, 0xfd, 0x81, 0xdf, 0xe9, 0x52,
+	0xba, 0x6a, 0xa3, 0xf2, 0xba, 0x03, 0x44, 0x01, 0x94, 0x1f, 0xaf, 0x7f, 0xf7, 0x93, 0xdd, 0x78,
-	0x57, 0xbb, 0x75, 0x15, 0xce, 0x2e, 0xe0, 0x6c, 0x49, 0x9c, 0x9c, 0x6f, 0x02, 0x94, 0x17, 0xd9,
+	0xf2, 0xf2, 0xd9, 0x6d, 0x48, 0x38, 0x5f, 0x21, 0xab, 0xbe, 0x9e, 0x01, 0xe1, 0x43, 0x96, 0x71,
-	0x08, 0x4e, 0x6d, 0xea, 0xaa, 0x18, 0x55, 0x7d, 0x7c, 0xd6, 0xe9, 0x47, 0xd4, 0x21, 0xda, 0xed,
+	0x62, 0xde, 0x47, 0x6f, 0xc0, 0x32, 0xc3, 0x72, 0x5a, 0x6e, 0xed, 0x96, 0xba, 0x70, 0xc4, 0xdf,
-	0xab, 0x80, 0x76, 0x00, 0x68, 0x03, 0x80, 0x12, 0xcf, 0x14, 0x26, 0x15, 0xd8, 0xb7, 0x7d, 0x7c,
+	0x9d, 0x4e, 0xec, 0x6d, 0x25, 0x00, 0x50, 0xad, 0x40, 0x87, 0x81, 0xee, 0x75, 0xbc, 0x22, 0x34,
-	0x76, 0xcc, 0x3f, 0xd5, 0x4d, 0x74, 0x27, 0x18, 0xf8, 0x7c, 0xb7, 0x86, 0xd4, 0x25, 0x11, 0xd3,
+	0x38, 0xff, 0x18, 0xe8, 0xaa, 0x60, 0x96, 0x4f, 0x49, 0xcc, 0x74, 0x0f, 0x21, 0xa8, 0xe8, 0xd1,
-	0xaa, 0x4d, 0x65, 0x7b, 0xc1, 0x5e, 0x0c, 0x06, 0xfe, 0x71, 0x22, 0xdb, 0x5f, 0xfa, 0xfe, 0x27,
+	0x58, 0x12, 0xb6, 0xfd, 0x9b, 0xe5, 0x63, 0x28, 0xb1, 0x5a, 0x67, 0x91, 0x09, 0xda, 0x10, 0x7c,
-	0xbd, 0x74, 0xfe, 0xf2, 0xd9, 0x7d, 0x58, 0x05, 0xe3, 0x6b, 0xa4, 0x15, 0xf7, 0xca, 0x26, 0xac,
+	0x1a, 0x9b, 0x9f, 0xa1, 0x35, 0xd8, 0x83, 0x3e, 0xe6, 0x7d, 0xb9, 0xd2, 0x6d, 0xff, 0x56, 0xe9,
-	0x1f, 0x06, 0x8c, 0xa8, 0x8f, 0xd0, 0x2d, 0xd8, 0x42, 0xb1, 0x60, 0xb5, 0x96, 0x66, 0x16, 0xae,
+	0x73, 0x05, 0xac, 0xed, 0x8d, 0x4c, 0x05, 0xb0, 0x92, 0x9f, 0x60, 0xde, 0xaf, 0xf8, 0xdc, 0xfc,
-	0x17, 0x13, 0x5c, 0xda, 0x1b, 0xe3, 0x91, 0xbe, 0x2e, 0xb3, 0x05, 0x6d, 0x92, 0x6b, 0x72, 0xb4,
+	0x8f, 0x3e, 0xf7, 0xd0, 0x46, 0x75, 0xda, 0x99, 0xc7, 0x27, 0xa8, 0x19, 0xc2, 0xb8, 0x6b, 0x47,
-	0x93, 0x58, 0xfb, 0x65, 0x9e, 0x83, 0xf1, 0x9f, 0x82, 0x16, 0x39, 0xb2, 0x68, 0x3a, 0xa7, 0xe8,
+	0x1b, 0x0b, 0xfe, 0xfa, 0x34, 0xf6, 0xb7, 0xa6, 0x13, 0xfb, 0x6d, 0x45, 0x5a, 0xd9, 0x0d, 0xb9,
-	0x10, 0x21, 0xb0, 0xe8, 0x50, 0x17, 0x36, 0xfa, 0x5e, 0xd6, 0xd5, 0x4c, 0x57, 0x88, 0xcc, 0x25,
+	0x13, 0xe2, 0x2c, 0xf8, 0xf9, 0xbb, 0xf2, 0x33, 0x90, 0xeb, 0x78, 0x99, 0x7e, 0xde, 0x41, 0x2d,
-	0x76, 0x15, 0x0e, 0x9f, 0xb9, 0xea, 0xe7, 0xa8, 0x06, 0x63, 0x75, 0x8a, 0xd9, 0x29, 0xec, 0xf8,
+	0xb5, 0xe3, 0x60, 0x65, 0xc5, 0x03, 0x95, 0x9f, 0xbf, 0x16, 0x4e, 0x00, 0xe5, 0x97, 0x68, 0x1e,
-	0x4e, 0xd6, 0xb6, 0x9c, 0xb2, 0x30, 0x86, 0x42, 0x64, 0xc3, 0x84, 0x7f, 0x8a, 0xd9, 0x69, 0xee,
+	0x97, 0xe6, 0xcd, 0x46, 0xfb, 0x7f, 0x16, 0xf4, 0xa9, 0x81, 0xd6, 0x4f, 0x79, 0x72, 0x7f, 0x18,
-	0x86, 0x99, 0xbf, 0xd6, 0x0d, 0x33, 0xcd, 0x73, 0x07, 0x2d, 0xe7, 0xab, 0x4d, 0x39, 0x3e, 0x40,
+	0xe3, 0x82, 0x7c, 0x8e, 0x73, 0x9c, 0x72, 0xf3, 0x03, 0xd4, 0xc6, 0xa3, 0xa2, 0xcf, 0x72, 0x5a,
-	0xf3, 0x5d, 0x28, 0xb7, 0xd6, 0x5a, 0x9e, 0xe2, 0xb7, 0x4d, 0xdd, 0xf6, 0xea, 0x78, 0xa4, 0xbf,
+	0x3c, 0x06, 0x4b, 0xad, 0x5f, 0x7e, 0x3e, 0xd8, 0x80, 0x3b, 0x7e, 0x12, 0xc7, 0x39, 0xe1, 0xfc,
-	0x2d, 0x41, 0x73, 0xa3, 0x26, 0x46, 0x8c, 0xfb, 0x02, 0x9f, 0x7f, 0x4a, 0x3e, 0x6d, 0x31, 0xdd,
+	0x8b, 0x22, 0xa7, 0x59, 0x12, 0x94, 0xa5, 0xe6, 0xfb, 0xa8, 0x35, 0x94, 0x1d, 0xe0, 0x0d, 0xbb,
-	0x37, 0xc9, 0xe7, 0x03, 0x54, 0x91, 0x2b, 0x03, 0x54, 0xe6, 0x38, 0x90, 0xf2, 0xc9, 0x2d, 0x33,
+	0xb9, 0xa0, 0x53, 0x11, 0xf8, 0x2b, 0xe2, 0x9d, 0x10, 0x40, 0xf1, 0xf1, 0x5b, 0xc2, 0x84, 0xb2,
-	0x6c, 0x30, 0xbf, 0x41, 0xf2, 0x98, 0x20, 0x2f, 0x2d, 0xed, 0xcd, 0x0c, 0xe8, 0x53, 0x05, 0x2d,
+	0x8d, 0xb3, 0x85, 0x36, 0x6b, 0x8a, 0xb4, 0x15, 0x47, 0x7f, 0x35, 0x51, 0xf3, 0x94, 0x27, 0xe6,
-	0x1d, 0x31, 0xef, 0x51, 0xdf, 0xc5, 0x31, 0x39, 0xc6, 0x11, 0xf6, 0x99, 0xfa, 0x21, 0xaa, 0xe2,
+	0xb7, 0x06, 0x7a, 0x73, 0xfe, 0x63, 0xb3, 0xbb, 0xc0, 0x55, 0xbf, 0xf0, 0x9d, 0x5b, 0x17, 0x96,
-	0x41, 0x7c, 0x1a, 0x46, 0x34, 0x7e, 0x02, 0x94, 0x6a, 0xbf, 0xfe, 0xb2, 0xbb, 0x0c, 0x9b, 0x7c,
+	0x68, 0x1e, 0xe7, 0xe6, 0x93, 0x5f, 0xff, 0xfe, 0xfe, 0xca, 0xae, 0x63, 0x7b, 0xf5, 0xef, 0x5e,
-	0xe0, 0xba, 0x11, 0x61, 0xec, 0x8b, 0x38, 0xa2, 0x81, 0x67, 0x67, 0xa6, 0xea, 0x07, 0xa8, 0xd2,
+	0x24, 0xeb, 0x7b, 0x90, 0x31, 0xc7, 0xa8, 0x5d, 0xde, 0xed, 0xed, 0xa5, 0x04, 0x1a, 0xee, 0xec,
-	0x17, 0x11, 0x04, 0x87, 0xb5, 0xd6, 0xca, 0x54, 0x9e, 0x12, 0xa0, 0x5d, 0xe6, 0x9b, 0x6f, 0x83,
+	0xbd, 0x12, 0x9e, 0x71, 0xdf, 0x90, 0xdc, 0xdb, 0xce, 0xf5, 0x45, 0x6e, 0x75, 0x81, 0x43, 0x1a,
-	0xf1, 0xfe, 0x5b, 0x9c, 0x84, 0x2c, 0x8c, 0xb1, 0x8a, 0x56, 0x0a, 0x19, 0x25, 0x54, 0x18, 0x3f,
+	0x0b, 0xde, 0xf2, 0x0e, 0x2c, 0xe5, 0x9d, 0xc1, 0xcb, 0x79, 0x17, 0xd6, 0xec, 0x15, 0xbc, 0xf0,
-	0xcb, 0x6c, 0x6d, 0xd2, 0x23, 0x98, 0x91, 0xc3, 0x41, 0xe0, 0xb2, 0x9b, 0x9c, 0x00, 0x68, 0xe4,
+	0x25, 0x10, 0xbc, 0x0f, 0xd0, 0xd5, 0xb9, 0x55, 0xd9, 0x59, 0xd6, 0xbb, 0x5a, 0xd1, 0xd9, 0xbf,
-	0xdc, 0x6b, 0x36, 0x72, 0x28, 0x0a, 0xc8, 0x27, 0xf9, 0x46, 0x7a, 0xd9, 0xfa, 0xb7, 0x8c, 0xe6,
+	0xa8, 0x42, 0x0b, 0xe8, 0xac, 0x7e, 0xfd, 0xf2, 0xd9, 0x6d, 0xc3, 0xff, 0xe8, 0xf9, 0x59, 0xd7,
-	0x8f, 0x98, 0xa7, 0x7e, 0xa7, 0xa0, 0x3b, 0x93, 0x6f, 0x88, 0x8d, 0x29, 0x94, 0xe2, 0x75, 0x58,
+	0x78, 0x71, 0xd6, 0x35, 0xfe, 0x3c, 0xeb, 0x1a, 0x4f, 0xcf, 0xbb, 0x8d, 0x17, 0xe7, 0xdd, 0xc6,
-	0xdf, 0xb9, 0xd2, 0x24, 0xed, 0xc2, 0xbd, 0xf3, 0xdf, 0xfe, 0xf9, 0x61, 0x6e, 0xc3, 0xd0, 0xad,
+	0x6f, 0xe7, 0xdd, 0xc6, 0x83, 0xbd, 0x84, 0x16, 0xee, 0x38, 0x0e, 0x5d, 0xf1, 0xef, 0x84, 0xe4,
-	0xe2, 0x73, 0xc6, 0x11, 0xf6, 0x1d, 0x90, 0xa8, 0x43, 0x54, 0xcd, 0x6e, 0xbe, 0xf5, 0x99, 0x00,
+	0xd1, 0x01, 0x65, 0xde, 0x00, 0x47, 0x2c, 0xa3, 0x51, 0xec, 0x3d, 0xd2, 0x8a, 0xc3, 0x96, 0xfc,
-	0x89, 0xba, 0xbe, 0xf5, 0x4a, 0x75, 0x8a, 0xbd, 0x29, 0xb0, 0xd7, 0x8d, 0xb5, 0x69, 0x6c, 0x79,
+	0xa0, 0xbf, 0xf7, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x2e, 0x75, 0x29, 0x87, 0x09, 0x00,
-	0xbd, 0x75, 0xa9, 0xcb, 0x71, 0xb3, 0x1b, 0x62, 0x26, 0x6e, 0xaa, 0x9e, 0x8d, 0x3b, 0xb5, 0x84,
-	0xaf, 0xc0, 0x85, 0xdf, 0x2e, 0xc7, 0x7d, 0x8c, 0x16, 0x27, 0x16, 0xa9, 0x39, 0x2b, 0x76, 0xde,
-	0xa2, 0xbe, 0x7d, 0x95, 0x45, 0x3a, 0x39, 0xe7, 0x0a, 0x5a, 0x9c, 0x98, 0xfb, 0xe6, 0xec, 0xc4,
-	0x33, 0x8b, 0xd9, 0xc1, 0x67, 0x8d, 0xa5, 0xf1, 0xae, 0xa8, 0xae, 0x69, 0x34, 0x66, 0x54, 0x27,
-	0xcc, 0x3b, 0x27, 0x22, 0xe2, 0xc2, 0x37, 0x2f, 0x9f, 0xdd, 0x57, 0xda, 0x1f, 0x3f, 0xbf, 0x68,
-	0x28, 0x2f, 0x2e, 0x1a, 0xca, 0xdf, 0x17, 0x0d, 0xe5, 0xe9, 0x65, 0xa3, 0xf4, 0xe2, 0xb2, 0x51,
-	0xfa, 0xe3, 0xb2, 0x51, 0x7a, 0xbc, 0xe5, 0xd1, 0xd8, 0x1c, 0xba, 0x5d, 0x93, 0xbf, 0x7c, 0x49,
-	0xe4, 0xec, 0xd2, 0xd0, 0xea, 0x61, 0x27, 0x0c, 0xa8, 0xe3, 0x5a, 0x67, 0x49, 0xe0, 0x6e, 0x45,
-	0x3c, 0xe1, 0xde, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x56, 0x96, 0xba, 0xe3, 0x0b, 0x00,
 	0x00,
 }
 
@@ -579,8 +478,6 @@ type MsgClient interface {
 	// UpdateParams defines an operation for updating the x/staking module
 	// parameters.
 	UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error)
-	// ReleaseFunds is the command for paying the winners of provider auctions
-	ReleaseFunds(ctx context.Context, in *MsgReleaseFunds, opts ...grpc.CallOption) (*MsgReleaseFundsResponse, error)
 }
 
 type msgClient struct {
@@ -627,15 +524,6 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts
 	return out, nil
 }
 
-func (c *msgClient) ReleaseFunds(ctx context.Context, in *MsgReleaseFunds, opts ...grpc.CallOption) (*MsgReleaseFundsResponse, error) {
-	out := new(MsgReleaseFundsResponse)
-	err := c.cc.Invoke(ctx, "/cerc.auction.v1.Msg/ReleaseFunds", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // MsgServer is the server API for Msg service.
 type MsgServer interface {
 	// CreateAuction is the command for creating an auction
@@ -647,8 +535,6 @@ type MsgServer interface {
 	// UpdateParams defines an operation for updating the x/staking module
 	// parameters.
 	UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error)
-	// ReleaseFunds is the command for paying the winners of provider auctions
-	ReleaseFunds(context.Context, *MsgReleaseFunds) (*MsgReleaseFundsResponse, error)
 }
 
 // UnimplementedMsgServer can be embedded to have forward compatible implementations.
@@ -667,9 +553,6 @@ func (*UnimplementedMsgServer) RevealBid(ctx context.Context, req *MsgRevealBid)
 func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented")
 }
-func (*UnimplementedMsgServer) ReleaseFunds(ctx context.Context, req *MsgReleaseFunds) (*MsgReleaseFundsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReleaseFunds not implemented")
-}
 
 func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
 	s.RegisterService(&_Msg_serviceDesc, srv)
@@ -747,24 +630,6 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Msg_ReleaseFunds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgReleaseFunds)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MsgServer).ReleaseFunds(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cerc.auction.v1.Msg/ReleaseFunds",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).ReleaseFunds(ctx, req.(*MsgReleaseFunds))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "cerc.auction.v1.Msg",
 	HandlerType: (*MsgServer)(nil),
@@ -785,10 +650,6 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateParams",
 			Handler:    _Msg_UpdateParams_Handler,
 		},
-		{
-			MethodName: "ReleaseFunds",
-			Handler:    _Msg_ReleaseFunds_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "cerc/auction/v1/tx.proto",
@@ -814,21 +675,13 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.NumProviders != 0 {
+	if len(m.Signer) > 0 {
-		i = encodeVarintTx(dAtA, i, uint64(m.NumProviders))
+		i -= len(m.Signer)
+		copy(dAtA[i:], m.Signer)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Signer)))
 		i--
-		dAtA[i] = 0x48
+		dAtA[i] = 0x32
 	}
-	{
-		size, err := m.MaxPrice.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintTx(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x42
 	{
 		size, err := m.MinimumBid.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -838,7 +691,7 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintTx(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x3a
+	dAtA[i] = 0x2a
 	{
 		size, err := m.RevealFee.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -848,7 +701,7 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintTx(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x32
+	dAtA[i] = 0x22
 	{
 		size, err := m.CommitFee.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -858,37 +711,23 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintTx(dAtA, i, uint64(size))
 	}
 	i--
-	dAtA[i] = 0x2a
+	dAtA[i] = 0x1a
-	n5, err5 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RevealsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RevealsDuration):])
+	n4, err4 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RevealsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RevealsDuration):])
+	if err4 != nil {
+		return 0, err4
+	}
+	i -= n4
+	i = encodeVarintTx(dAtA, i, uint64(n4))
+	i--
+	dAtA[i] = 0x12
+	n5, err5 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.CommitsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CommitsDuration):])
 	if err5 != nil {
 		return 0, err5
 	}
 	i -= n5
 	i = encodeVarintTx(dAtA, i, uint64(n5))
 	i--
-	dAtA[i] = 0x22
-	n6, err6 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.CommitsDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CommitsDuration):])
-	if err6 != nil {
-		return 0, err6
-	}
-	i -= n6
-	i = encodeVarintTx(dAtA, i, uint64(n6))
-	i--
-	dAtA[i] = 0x1a
-	if len(m.Kind) > 0 {
-		i -= len(m.Kind)
-		copy(dAtA[i:], m.Kind)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.Kind)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.Signer) > 0 {
-		i -= len(m.Signer)
-		copy(dAtA[i:], m.Signer)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.Signer)))
-		i--
 	dAtA[i] = 0xa
-	}
 	return len(dAtA) - i, nil
 }
 
@@ -1148,78 +987,6 @@ func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgReleaseFunds) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MsgReleaseFunds) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgReleaseFunds) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.Signer) > 0 {
-		i -= len(m.Signer)
-		copy(dAtA[i:], m.Signer)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.Signer)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.AuctionId) > 0 {
-		i -= len(m.AuctionId)
-		copy(dAtA[i:], m.AuctionId)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.AuctionId)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *MsgReleaseFundsResponse) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MsgReleaseFundsResponse) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgReleaseFundsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.Auction != nil {
-		{
-			size, err := m.Auction.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintTx(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	offset -= sovTx(v)
 	base := offset
@@ -1237,14 +1004,6 @@ func (m *MsgCreateAuction) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = len(m.Signer)
-	if l > 0 {
-		n += 1 + l + sovTx(uint64(l))
-	}
-	l = len(m.Kind)
-	if l > 0 {
-		n += 1 + l + sovTx(uint64(l))
-	}
 	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CommitsDuration)
 	n += 1 + l + sovTx(uint64(l))
 	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RevealsDuration)
@@ -1255,10 +1014,9 @@ func (m *MsgCreateAuction) Size() (n int) {
 	n += 1 + l + sovTx(uint64(l))
 	l = m.MinimumBid.Size()
 	n += 1 + l + sovTx(uint64(l))
-	l = m.MaxPrice.Size()
+	l = len(m.Signer)
+	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
-	if m.NumProviders != 0 {
-		n += 1 + sovTx(uint64(m.NumProviders))
 	}
 	return n
 }
@@ -1368,36 +1126,6 @@ func (m *MsgUpdateParamsResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgReleaseFunds) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.AuctionId)
-	if l > 0 {
-		n += 1 + l + sovTx(uint64(l))
-	}
-	l = len(m.Signer)
-	if l > 0 {
-		n += 1 + l + sovTx(uint64(l))
-	}
-	return n
-}
-
-func (m *MsgReleaseFundsResponse) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Auction != nil {
-		l = m.Auction.Size()
-		n += 1 + l + sovTx(uint64(l))
-	}
-	return n
-}
-
 func sovTx(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -1434,70 +1162,6 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTx
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTx
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Signer = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTx
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTx
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Kind = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CommitsDuration", wireType)
 			}
@@ -1530,7 +1194,7 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 4:
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field RevealsDuration", wireType)
 			}
@@ -1563,7 +1227,7 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 5:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CommitFee", wireType)
 			}
@@ -1596,7 +1260,7 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 6:
+		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field RevealFee", wireType)
 			}
@@ -1629,7 +1293,7 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 7:
+		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field MinimumBid", wireType)
 			}
@@ -1662,11 +1326,11 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 8:
+		case 6:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType)
 			}
-			var msglen int
+			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowTx
@@ -1676,44 +1340,24 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= int(b&0x7F) << shift
+				stringLen |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if msglen < 0 {
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
 				return ErrInvalidLengthTx
 			}
-			postIndex := iNdEx + msglen
+			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
 				return ErrInvalidLengthTx
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if err := m.MaxPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Signer = string(dAtA[iNdEx:postIndex])
-				return err
-			}
 			iNdEx = postIndex
-		case 9:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType)
-			}
-			m.NumProviders = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.NumProviders |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTx(dAtA[iNdEx:])
@@ -2450,206 +2094,6 @@ func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgReleaseFunds) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTx
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: MsgReleaseFunds: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgReleaseFunds: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AuctionId", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTx
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTx
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.AuctionId = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTx
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTx
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Signer = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTx(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTx
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *MsgReleaseFundsResponse) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTx
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: MsgReleaseFundsResponse: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgReleaseFundsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Auction", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTx
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTx
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTx
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Auction == nil {
-				m.Auction = &Auction{}
-			}
-			if err := m.Auction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTx(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthTx
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func skipTx(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

x/auction/tx.pb.gw.go

@@ -141,42 +141,6 @@ func local_request_Msg_RevealBid_0(ctx context.Context, marshaler runtime.Marsha
 
 }
 
-var (
-	filter_Msg_ReleaseFunds_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
-)
-
-func request_Msg_ReleaseFunds_0(ctx context.Context, marshaler runtime.Marshaler, client MsgClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgReleaseFunds
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReleaseFunds_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.ReleaseFunds(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_Msg_ReleaseFunds_0(ctx context.Context, marshaler runtime.Marshaler, server MsgServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgReleaseFunds
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReleaseFunds_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := server.ReleaseFunds(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
 // RegisterMsgHandlerServer registers the http handlers for service Msg to "mux".
 // UnaryRPC     :call MsgServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -252,29 +216,6 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 
 	})
 
-	mux.Handle("POST", pattern_Msg_ReleaseFunds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_Msg_ReleaseFunds_0(rctx, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_Msg_ReleaseFunds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	return nil
 }
 
@@ -376,26 +317,6 @@ func RegisterMsgHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 
 	})
 
-	mux.Handle("POST", pattern_Msg_ReleaseFunds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_Msg_ReleaseFunds_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_Msg_ReleaseFunds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	return nil
 }
 
@@ -405,8 +326,6 @@ var (
 	pattern_Msg_CommitBid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "auction", "v1", "commit_bid"}, "", runtime.AssumeColonVerbOpt(false)))
 
 	pattern_Msg_RevealBid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "auction", "v1", "reveal_bid"}, "", runtime.AssumeColonVerbOpt(false)))
-
-	pattern_Msg_ReleaseFunds_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "auction", "v1", "release_funds"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
@@ -415,6 +334,4 @@ var (
 	forward_Msg_CommitBid_0 = runtime.ForwardResponseMessage
 
 	forward_Msg_RevealBid_0 = runtime.ForwardResponseMessage
-
-	forward_Msg_ReleaseFunds_0 = runtime.ForwardResponseMessage
 )

x/auction/types.go

@@ -29,12 +29,6 @@ const (
 	BidStatusRevealed  = "reveal"
 )
 
-// Auction kinds
-const (
-	AuctionKindVickrey  = "vickrey"
-	AuctionKindProvider = "provider"
-)
-
 // AuctionId simplifies generation of auction ids.
 type AuctionId struct {
 	Address  sdk.Address

x/bond/params.go

@@ -5,12 +5,11 @@ import (
 	fmt "fmt"
 
 	sdkmath "cosmossdk.io/math"
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // DefaultMaxBondAmountTokens are the default parameter values.
-var DefaultMaxBondAmountTokens = sdkmath.NewInt(1000000000000) // 10^12
+var DefaultMaxBondAmountTokens = sdkmath.NewInt(1000000000000) // 10^12 alnt
 
 func NewParams(maxBondAmount sdk.Coin) Params {
 	return Params{MaxBondAmount: maxBondAmount}
@@ -18,7 +17,7 @@ func NewParams(maxBondAmount sdk.Coin) Params {
 
 // DefaultParams returns default module parameters
 func DefaultParams() Params {
-	return NewParams(sdk.NewCoin(params.CoinUnit, DefaultMaxBondAmountTokens))
+	return NewParams(sdk.NewCoin(sdk.DefaultBondDenom, DefaultMaxBondAmountTokens))
 }
 
 // Validate checks that the parameters have valid values

x/onboarding/keeper/keeper.go

@@ -80,7 +80,7 @@ func (k Keeper) OnboardParticipant(
 	}
 
 	if !params.OnboardingEnabled {
-		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Onboarding is disabled")
+		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Validator onboarding is disabled")
 	}
 
 	message, err := json.Marshal(msg.EthPayload)

x/registry/keeper/genesis.go

@@ -30,18 +30,11 @@ func (k *Keeper) InitGenesis(ctx sdk.Context, data *registry.GenesisState) error
 				return err
 			}
 		}
-
-		readableRecord := record.ToReadableRecord()
-		if err := k.processAttributes(ctx, readableRecord.Attributes, record.Id); err != nil {
-			return err
-		}
 	}
 
 	for _, authority := range data.Authorities {
 		// Only import authorities that are marked active.
 		if authority.Entry.Status == registry.AuthorityActive {
-			// Reset authority height
-			authority.Entry.Height = uint64(ctx.BlockHeight())
 			if err := k.SaveNameAuthority(ctx, authority.Name, authority.Entry); err != nil {
 				return err
 			}
@@ -69,7 +62,7 @@ func (k *Keeper) ExportGenesis(ctx sdk.Context) (*registry.GenesisState, error)
 		return nil, err
 	}
 
-	records, _, err := k.PaginatedListRecords(ctx, nil)
+	records, err := k.ListRecords(ctx)
 	if err != nil {
 		return nil, err
 	}

x/registry/keeper/keeper.go

@@ -16,7 +16,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/types/query"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	"github.com/gibson042/canonicaljson-go"
@@ -205,12 +204,10 @@ func (k Keeper) HasRecord(ctx sdk.Context, id string) (bool, error) {
 	return has, nil
 }
 
-// PaginatedListRecords - get all records with optional pagination.
+// ListRecords - get all records.
-func (k Keeper) PaginatedListRecords(ctx sdk.Context, pagination *query.PageRequest) ([]registrytypes.Record, *query.PageResponse, error) {
+func (k Keeper) ListRecords(ctx sdk.Context) ([]registrytypes.Record, error) {
 	var records []registrytypes.Record
-	var pageResp *query.PageResponse
 
-	if pagination == nil {
 	err := k.Records.Walk(ctx, nil, func(key string, value registrytypes.Record) (bool, error) {
 		if err := k.populateRecordNames(ctx, &value); err != nil {
 			return true, err
@@ -220,27 +217,10 @@ func (k Keeper) PaginatedListRecords(ctx sdk.Context, pagination *query.PageRequ
 		return false, nil
 	})
 	if err != nil {
-			return nil, nil, err
+		return nil, err
-		}
-	} else {
-		var err error
-		records, pageResp, err = query.CollectionPaginate(
-			ctx,
-			k.Records,
-			pagination,
-			func(key string, value registrytypes.Record) (registrytypes.Record, error) {
-				if err := k.populateRecordNames(ctx, &value); err != nil {
-					return registrytypes.Record{}, err
 	}
 
-				return value, nil
+	return records, nil
-			})
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return records, pageResp, nil
 }
 
 // GetRecordById - gets a record from the store.
@@ -281,47 +261,36 @@ func (k Keeper) GetRecordsByBondId(ctx sdk.Context, bondId string) ([]registryty
 	return records, nil
 }
 
-// PaginatedRecordsFromAttributes gets a list of records whose attributes match all provided values
+// RecordsFromAttributes gets a list of records whose attributes match all provided values
-// with optional pagination.
+func (k Keeper) RecordsFromAttributes(
-func (k Keeper) PaginatedRecordsFromAttributes(
 	ctx sdk.Context,
 	attributes []*registrytypes.QueryRecordsRequest_KeyValueInput,
 	all bool,
-	pagination *query.PageRequest,
+) ([]registrytypes.Record, error) {
-) ([]registrytypes.Record, *query.PageResponse, error) {
+	resultRecordIds := []string{}
-	var resultRecordIds []string
-	var pageResp *query.PageResponse
-
-	filteredRecordIds := []string{}
 	for i, attr := range attributes {
 		suffix, err := QueryValueToJSON(attr.Value)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		mapKey := collections.Join(attr.Key, string(suffix))
 		recordIds, err := k.getAttributeMapping(ctx, mapKey)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		if i == 0 {
-			filteredRecordIds = recordIds
+			resultRecordIds = recordIds
 		} else {
-			filteredRecordIds = getIntersection(recordIds, filteredRecordIds)
+			resultRecordIds = getIntersection(recordIds, resultRecordIds)
 		}
 	}
 
-	if pagination != nil {
-		resultRecordIds, pageResp = paginate(filteredRecordIds, pagination)
-	} else {
-		resultRecordIds = filteredRecordIds
-	}
-
 	records := []registrytypes.Record{}
 	for _, id := range resultRecordIds {
 		record, err := k.GetRecordById(ctx, id)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		if record.Deleted {
 			continue
@@ -332,7 +301,7 @@ func (k Keeper) PaginatedRecordsFromAttributes(
 		records = append(records, record)
 	}
 
-	return records, pageResp, nil
+	return records, nil
 }
 
 // TODO not recursive, and only should be if we want to support querying with whole sub-objects,
@@ -748,38 +717,6 @@ func (k Keeper) tryTakeRecordRent(ctx sdk.Context, record registrytypes.Record)
 	return k.SaveRecord(ctx, record)
 }
 
-// paginate implements basic pagination over a list of objects
-func paginate[T any](data []T, pagination *query.PageRequest) ([]T, *query.PageResponse) {
-	pageReq := initPageRequestDefaults(pagination)
-
-	offset := pageReq.Offset
-	limit := pageReq.Limit
-	countTotal := pageReq.CountTotal
-
-	totalItems := uint64(len(data))
-	start := offset
-	end := offset + limit
-
-	if start > totalItems {
-		if countTotal {
-			return []T{}, &query.PageResponse{Total: 0}
-		} else {
-			return []T{}, nil
-		}
-	}
-	if end > totalItems {
-		end = totalItems
-	}
-
-	paginatedItems := data[start:end]
-
-	if countTotal {
-		return paginatedItems, &query.PageResponse{Total: totalItems}
-	} else {
-		return paginatedItems, nil
-	}
-}
-
 func getIntersection(a []string, b []string) []string {
 	result := []string{}
 	if len(a) < len(b) {
@@ -806,26 +743,3 @@ func contains(arr []string, str string) bool {
 	}
 	return false
 }
-
-// https://github.com/cosmos/cosmos-sdk/blob/v0.50.3/types/query/pagination.go#L141
-// initPageRequestDefaults initializes a PageRequest's defaults when those are not set.
-func initPageRequestDefaults(pageRequest *query.PageRequest) *query.PageRequest {
-	// if the PageRequest is nil, use default PageRequest
-	if pageRequest == nil {
-		pageRequest = &query.PageRequest{}
-	}
-
-	pageRequestCopy := *pageRequest
-	if len(pageRequestCopy.Key) == 0 {
-		pageRequestCopy.Key = nil
-	}
-
-	if pageRequestCopy.Limit == 0 {
-		pageRequestCopy.Limit = query.DefaultLimit
-
-		// count total results when the limit is zero/not supplied
-		pageRequestCopy.CountTotal = true
-	}
-
-	return &pageRequestCopy
-}

x/registry/keeper/naming_keeper.go

@@ -7,15 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"cosmossdk.io/math"
-
 	"cosmossdk.io/collections"
 	errorsmod "cosmossdk.io/errors"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"git.vdb.to/cerc-io/laconicd/app/params"
 	auctiontypes "git.vdb.to/cerc-io/laconicd/x/auction"
 	registrytypes "git.vdb.to/cerc-io/laconicd/x/registry"
 	"git.vdb.to/cerc-io/laconicd/x/registry/helpers"
@@ -288,18 +285,16 @@ func (k Keeper) createAuthority(ctx sdk.Context, name string, owner string, isRo
 		// Reset bond ID if required.
 		authority.BondId = ""
 
+		params := auctiontypes.Params{
+			CommitsDuration: moduleParams.AuthorityAuctionCommitsDuration,
+			RevealsDuration: moduleParams.AuthorityAuctionRevealsDuration,
+			CommitFee:       moduleParams.AuthorityAuctionCommitFee,
+			RevealFee:       moduleParams.AuthorityAuctionRevealFee,
+			MinimumBid:      moduleParams.AuthorityAuctionMinimumBid,
+		}
+
 		// Create an auction.
-		msg := auctiontypes.NewMsgCreateAuction(
+		msg := auctiontypes.NewMsgCreateAuction(params, ownerAddress)
-			auctiontypes.AuctionKindVickrey,
-			moduleParams.AuthorityAuctionCommitsDuration,
-			moduleParams.AuthorityAuctionRevealsDuration,
-			moduleParams.AuthorityAuctionCommitFee,
-			moduleParams.AuthorityAuctionRevealFee,
-			moduleParams.AuthorityAuctionMinimumBid,
-			sdk.NewCoin(params.CoinUnit, math.NewInt(0)),
-			0,
-			ownerAddress,
-		)
 
 		auction, sdkErr := k.auctionKeeper.CreateAuction(ctx, msg)
 		if sdkErr != nil {

x/registry/keeper/query_server.go

@@ -6,7 +6,6 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/types/query"
 
 	registrytypes "git.vdb.to/cerc-io/laconicd/x/registry"
 )
@@ -40,21 +39,20 @@ func (qs queryServer) Records(c context.Context, req *registrytypes.QueryRecords
 	all := req.GetAll()
 
 	var records []registrytypes.Record
-	var pageResp *query.PageResponse
 	var err error
 	if len(attributes) > 0 {
-		records, pageResp, err = qs.k.PaginatedRecordsFromAttributes(ctx, attributes, all, req.Pagination)
+		records, err = qs.k.RecordsFromAttributes(ctx, attributes, all)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		records, pageResp, err = qs.k.PaginatedListRecords(ctx, req.Pagination)
+		records, err = qs.k.ListRecords(ctx)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	return &registrytypes.QueryRecordsResponse{Records: records, Pagination: pageResp}, nil
+	return &registrytypes.QueryRecordsResponse{Records: records}, nil
 }
 
 func (qs queryServer) GetRecord(c context.Context, req *registrytypes.QueryGetRecordRequest) (*registrytypes.QueryGetRecordResponse, error) {

x/registry/keeper/record_keeper.go

@@ -94,9 +94,9 @@ func (rk RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionId string
 	}
 
 	if auctionObj.Status == auctiontypes.AuctionStatusCompleted {
-		if len(auctionObj.WinnerAddresses) != 0 {
+		if auctionObj.WinnerAddress != "" {
 			// Mark authority owner and change status to active.
-			authority.OwnerAddress = auctionObj.WinnerAddresses[0]
+			authority.OwnerAddress = auctionObj.WinnerAddress
 			authority.Status = registrytypes.AuthorityActive
 
 			// Reset bond id if required, as owner has changed.

x/registry/params.go

@@ -6,28 +6,26 @@ import (
 
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"git.vdb.to/cerc-io/laconicd/app/params"
 )
 
 // Default parameter values.
 var (
 	// DefaultRecordRent is the default record rent for 1 time period (see expiry time).
-	DefaultRecordRent = sdkmath.NewInt(1000000) // 10^6
+	DefaultRecordRent = sdkmath.NewInt(1000000) // 10^6 alnt
 
 	// DefaultRecordExpiryTime is the default record expiry time (1 year).
 	DefaultRecordExpiryTime = time.Hour * 24 * 365
 
-	DefaultAuthorityRent        = sdkmath.NewInt(1000000) // 10^6
+	DefaultAuthorityRent        = sdkmath.NewInt(1000000) // 10^6 alnt
 	DefaultAuthorityExpiryTime  = time.Hour * 24 * 365
 	DefaultAuthorityGracePeriod = time.Hour * 24 * 2
 
 	DefaultAuthorityAuctionEnabled = false
 	DefaultCommitsDuration         = time.Hour * 24
 	DefaultRevealsDuration         = time.Hour * 24
-	DefaultCommitFee               = sdkmath.NewInt(1000000) // 10^6
+	DefaultCommitFee               = sdkmath.NewInt(1000000) // 10^6 alnt
-	DefaultRevealFee               = sdkmath.NewInt(1000000) // 10^6
+	DefaultRevealFee               = sdkmath.NewInt(1000000) // 10^6 alnt
-	DefaultMinimumBid              = sdkmath.NewInt(5000000) // 5 * 10^6
+	DefaultMinimumBid              = sdkmath.NewInt(5000000) // 5 * 10^6 alnt
 )
 
 // NewParams creates a new Params instance
@@ -62,13 +60,13 @@ func NewParams(
 // DefaultParams returns a default set of parameters.
 func DefaultParams() Params {
 	return NewParams(
-		sdk.NewCoin(params.CoinUnit, DefaultRecordRent), DefaultRecordExpiryTime,
+		sdk.NewCoin(sdk.DefaultBondDenom, DefaultRecordRent), DefaultRecordExpiryTime,
-		sdk.NewCoin(params.CoinUnit, DefaultAuthorityRent),
+		sdk.NewCoin(sdk.DefaultBondDenom, DefaultAuthorityRent),
 		DefaultAuthorityExpiryTime, DefaultAuthorityGracePeriod, DefaultAuthorityAuctionEnabled, DefaultCommitsDuration,
 		DefaultRevealsDuration,
-		sdk.NewCoin(params.CoinUnit, DefaultCommitFee),
+		sdk.NewCoin(sdk.DefaultBondDenom, DefaultCommitFee),
-		sdk.NewCoin(params.CoinUnit, DefaultRevealFee),
+		sdk.NewCoin(sdk.DefaultBondDenom, DefaultRevealFee),
-		sdk.NewCoin(params.CoinUnit, DefaultMinimumBid),
+		sdk.NewCoin(sdk.DefaultBondDenom, DefaultMinimumBid),
 	)
 }
 

x/types/v1/lockup.go

@@ -1,51 +0,0 @@
-package v1
-
-import (
-	"errors"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-)
-
-var (
-	_ authtypes.GenesisAccount = (*LockupAccount)(nil)
-	_ LockupAccountI           = (*LockupAccount)(nil)
-)
-
-// LockupAccountI defines an account interface for lockup account with token distribution
-type LockupAccountI interface {
-	sdk.ModuleAccountI
-
-	GetDistribution() string
-}
-
-// Validate checks for errors on the account fields
-func (la LockupAccount) Validate() error {
-	if la.BaseAccount == nil {
-		return errors.New("uninitialized LockupAccount: BaseAccount is nil")
-	}
-
-	return la.BaseAccount.Validate()
-}
-
-// HasPermission returns whether or not the account has permission.
-// Return false as the lockup account doesn't have any permissions
-func (la LockupAccount) HasPermission(permission string) bool {
-	return false
-}
-
-// GetName returns the name of the holder's module
-func (la LockupAccount) GetName() string {
-	return la.Name
-}
-
-// GetPermissions returns permissions granted to the module account
-// Return empty as the lockup account doesn't have any permissions
-func (la LockupAccount) GetPermissions() []string {
-	return []string{}
-}
-
-// GetDistribution returns the total token distribution
-func (la LockupAccount) GetDistribution() string {
-	return la.Distribution
-}

x/types/v1/lockup.pb.go

@@ -1,422 +0,0 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cerc/types/v1/lockup.proto
-
-package v1
-
-import (
-	fmt "fmt"
-	_ "github.com/cosmos/cosmos-proto"
-	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
-	types "github.com/cosmos/cosmos-sdk/x/auth/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
-	proto "github.com/cosmos/gogoproto/proto"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-
-// LockupAccount extends the Cosmos SDK BaseAccount with a name and distribution
-// field. It satisfies the ModuleAccountI interface to allow querying it as a
-// module account.
-type LockupAccount struct {
-	*types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"`
-	Name               string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Distribution       string `protobuf:"bytes,3,opt,name=distribution,proto3" json:"distribution,omitempty"`
-}
-
-func (m *LockupAccount) Reset()         { *m = LockupAccount{} }
-func (m *LockupAccount) String() string { return proto.CompactTextString(m) }
-func (*LockupAccount) ProtoMessage()    {}
-func (*LockupAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8fa58dc19f6348bf, []int{0}
-}
-func (m *LockupAccount) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *LockupAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_LockupAccount.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *LockupAccount) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LockupAccount.Merge(m, src)
-}
-func (m *LockupAccount) XXX_Size() int {
-	return m.Size()
-}
-func (m *LockupAccount) XXX_DiscardUnknown() {
-	xxx_messageInfo_LockupAccount.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_LockupAccount proto.InternalMessageInfo
-
-func init() {
-	proto.RegisterType((*LockupAccount)(nil), "cerc.types.v1.LockupAccount")
-}
-
-func init() { proto.RegisterFile("cerc/types/v1/lockup.proto", fileDescriptor_8fa58dc19f6348bf) }
-
-var fileDescriptor_8fa58dc19f6348bf = []byte{
-	// 335 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0x4e, 0x2d, 0x4a,
-	0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x33, 0xd4, 0xcf, 0xc9, 0x4f, 0xce, 0x2e, 0x2d,
-	0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x05, 0xc9, 0xe9, 0x81, 0xe5, 0xf4, 0xca, 0x0c,
-	0xa5, 0x04, 0x13, 0x73, 0x33, 0xf3, 0xf2, 0xf5, 0xc1, 0x24, 0x44, 0x85, 0x94, 0x64, 0x72, 0x7e,
-	0x71, 0x6e, 0x7e, 0x71, 0x3c, 0x98, 0xa7, 0x0f, 0xe1, 0x40, 0xa5, 0xe4, 0x20, 0x3c, 0xfd, 0xc4,
-	0xd2, 0x92, 0x0c, 0xfd, 0x32, 0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x2a, 0x2f, 0x92,
-	0x9e, 0x9f, 0x9e, 0x0f, 0xd1, 0x07, 0x62, 0x41, 0x44, 0x95, 0xba, 0x99, 0xb8, 0x78, 0x7d, 0xc0,
-	0x6e, 0x70, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x11, 0xf2, 0xe4, 0xe2, 0x49, 0x4a, 0x2c, 0x4e,
-	0x8d, 0x4f, 0x84, 0xf0, 0x25, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0x14, 0xf4, 0xa0, 0x96, 0x81,
-	0x4d, 0x84, 0x1a, 0xaf, 0xe7, 0x94, 0x58, 0x9c, 0x0a, 0xd5, 0xe7, 0xc4, 0x72, 0xe1, 0x9e, 0x3c,
-	0x63, 0x10, 0x77, 0x12, 0x42, 0x48, 0x48, 0x88, 0x8b, 0x25, 0x2f, 0x31, 0x37, 0x55, 0x82, 0x49,
-	0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x16, 0x52, 0xe2, 0xe2, 0x49, 0xc9, 0x2c, 0x2e, 0x29, 0xca,
-	0x4c, 0x2a, 0x2d, 0xc9, 0xcc, 0xcf, 0x93, 0x60, 0x06, 0xcb, 0xa1, 0x88, 0x59, 0x95, 0x77, 0x2c,
-	0x90, 0x67, 0x38, 0xb5, 0x45, 0x57, 0x09, 0x9b, 0x9d, 0xbe, 0xf9, 0x29, 0xa5, 0x39, 0x30, 0x2b,
-	0x3c, 0x4f, 0x6d, 0xd1, 0x95, 0x41, 0x09, 0x35, 0x3d, 0x14, 0xdf, 0x78, 0x76, 0x3d, 0xdf, 0xa0,
-	0x25, 0x9a, 0x93, 0x98, 0x9c, 0x9f, 0x97, 0x99, 0xac, 0x8f, 0x22, 0x35, 0xe9, 0xf9, 0x06, 0x2d,
-	0x3e, 0x48, 0xf0, 0xc3, 0xfc, 0xea, 0xe4, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c,
-	0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72,
-	0x0c, 0x51, 0x6a, 0xe9, 0x99, 0x25, 0x7a, 0x65, 0x29, 0x49, 0x7a, 0xa0, 0x60, 0x4f, 0x2d, 0x4a,
-	0xd6, 0xcd, 0xcc, 0xd7, 0x87, 0x1a, 0x9b, 0xa2, 0x5f, 0x01, 0x8f, 0xcf, 0x24, 0x36, 0x70, 0xb0,
-	0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x89, 0x9d, 0x6b, 0xe7, 0x01, 0x00, 0x00,
-}
-
-func (m *LockupAccount) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *LockupAccount) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *LockupAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.Distribution) > 0 {
-		i -= len(m.Distribution)
-		copy(dAtA[i:], m.Distribution)
-		i = encodeVarintLockup(dAtA, i, uint64(len(m.Distribution)))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.Name) > 0 {
-		i -= len(m.Name)
-		copy(dAtA[i:], m.Name)
-		i = encodeVarintLockup(dAtA, i, uint64(len(m.Name)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if m.BaseAccount != nil {
-		{
-			size, err := m.BaseAccount.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintLockup(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintLockup(dAtA []byte, offset int, v uint64) int {
-	offset -= sovLockup(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *LockupAccount) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.BaseAccount != nil {
-		l = m.BaseAccount.Size()
-		n += 1 + l + sovLockup(uint64(l))
-	}
-	l = len(m.Name)
-	if l > 0 {
-		n += 1 + l + sovLockup(uint64(l))
-	}
-	l = len(m.Distribution)
-	if l > 0 {
-		n += 1 + l + sovLockup(uint64(l))
-	}
-	return n
-}
-
-func sovLockup(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozLockup(x uint64) (n int) {
-	return sovLockup(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *LockupAccount) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowLockup
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: LockupAccount: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: LockupAccount: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field BaseAccount", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowLockup
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthLockup
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthLockup
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.BaseAccount == nil {
-				m.BaseAccount = &types.BaseAccount{}
-			}
-			if err := m.BaseAccount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowLockup
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthLockup
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthLockup
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Name = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Distribution", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowLockup
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthLockup
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthLockup
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Distribution = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipLockup(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthLockup
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipLockup(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowLockup
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowLockup
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowLockup
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthLockup
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupLockup
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthLockup
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthLockup        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowLockup          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupLockup = fmt.Errorf("proto: unexpected end of group")
-)