Delay unilateral exit and support send to onchain address (#117)

* add delay on redeem close + forfeit close * increase default round lifetime (16 minutes min) * add sequence to final pset * update CLI and server to support delayed vtxos oncahin * rename future to "locked" * add configurable EXIT_DELAY variable * renaming * rename "close" --> "closure" * rename "close" to "closure" * error message config.go
2025-12-18 12:44:19 +01:00 · 2024-02-22 16:47:52 +01:00
parent 7c8ee7ab12
commit a95a829b20
30 changed files with 1244 additions and 719 deletions
--- a/server/api-spec/openapi/swagger/ark/v1/service.swagger.json
+++ b/server/api-spec/openapi/swagger/ark/v1/service.swagger.json
@@ -77,6 +77,28 @@
        ]
      }
    },
+    "/v1/info": {
+      "get": {
+        "operationId": "ArkService_GetInfo",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/v1GetInfoResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "tags": [
+          "ArkService"
+        ]
+      }
+    },
    "/v1/payment/claim": {
      "post": {
        "operationId": "ArkService_ClaimPayment",
@@ -203,28 +225,6 @@
        ]
      }
    },
-    "/v1/pubkey": {
-      "get": {
-        "operationId": "ArkService_GetPubkey",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/v1GetPubkeyResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "tags": [
-          "ArkService"
-        ]
-      }
-    },
    "/v1/round/{txid}": {
      "get": {
        "operationId": "ArkService_GetRound",
@@ -367,11 +367,19 @@
        }
      }
    },
-    "v1GetPubkeyResponse": {
+    "v1GetInfoResponse": {
      "type": "object",
      "properties": {
        "pubkey": {
          "type": "string"
+        },
+        "lifetime": {
+          "type": "string",
+          "format": "int64"
+        },
+        "exitDelay": {
+          "type": "string",
+          "format": "int64"
        }
      }
    },
--- a/server/api-spec/protobuf/ark/v1/service.proto
+++ b/server/api-spec/protobuf/ark/v1/service.proto
@@ -48,9 +48,9 @@ service ArkService {
      get: "/v1/vtxos/{address}"
    };
  }
-  rpc GetPubkey(GetPubkeyRequest) returns (GetPubkeyResponse) {
+  rpc GetInfo(GetInfoRequest) returns (GetInfoResponse) {
    option (google.api.http) = {
-      get: "/v1/pubkey"
+      get: "/v1/info"
    };
  }
 }
@@ -172,8 +172,10 @@ message Vtxo {
  string pool_txid = 4;
 }

-message GetPubkeyRequest {}
+message GetInfoRequest {}

-message GetPubkeyResponse {
+message GetInfoResponse {
  string pubkey = 1;
+  int64 lifetime = 2;
+  int64 exit_delay = 3;
 }
--- a/server/api-spec/protobuf/gen/ark/v1/service.pb.go
+++ b/server/api-spec/protobuf/gen/ark/v1/service.pb.go
@@ -1388,14 +1388,14 @@ func (x *Vtxo) GetPoolTxid() string {
 	return ""
 }

-type GetPubkeyRequest struct {
+type GetInfoRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }

-func (x *GetPubkeyRequest) Reset() {
-	*x = GetPubkeyRequest{}
+func (x *GetInfoRequest) Reset() {
+	*x = GetInfoRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ark_v1_service_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1403,13 +1403,13 @@ func (x *GetPubkeyRequest) Reset() {
 	}
 }

-func (x *GetPubkeyRequest) String() string {
+func (x *GetInfoRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*GetPubkeyRequest) ProtoMessage() {}
+func (*GetInfoRequest) ProtoMessage() {}

-func (x *GetPubkeyRequest) ProtoReflect() protoreflect.Message {
+func (x *GetInfoRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_ark_v1_service_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1421,21 +1421,23 @@ func (x *GetPubkeyRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use GetPubkeyRequest.ProtoReflect.Descriptor instead.
-func (*GetPubkeyRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetInfoRequest.ProtoReflect.Descriptor instead.
+func (*GetInfoRequest) Descriptor() ([]byte, []int) {
 	return file_ark_v1_service_proto_rawDescGZIP(), []int{26}
 }

-type GetPubkeyResponse struct {
+type GetInfoResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
+	Pubkey    string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
+	Lifetime  int64  `protobuf:"varint,2,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	ExitDelay int64  `protobuf:"varint,3,opt,name=exit_delay,json=exitDelay,proto3" json:"exit_delay,omitempty"`
 }

-func (x *GetPubkeyResponse) Reset() {
-	*x = GetPubkeyResponse{}
+func (x *GetInfoResponse) Reset() {
+	*x = GetInfoResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ark_v1_service_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1443,13 +1445,13 @@ func (x *GetPubkeyResponse) Reset() {
 	}
 }

-func (x *GetPubkeyResponse) String() string {
+func (x *GetInfoResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*GetPubkeyResponse) ProtoMessage() {}
+func (*GetInfoResponse) ProtoMessage() {}

-func (x *GetPubkeyResponse) ProtoReflect() protoreflect.Message {
+func (x *GetInfoResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_ark_v1_service_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1461,18 +1463,32 @@ func (x *GetPubkeyResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use GetPubkeyResponse.ProtoReflect.Descriptor instead.
-func (*GetPubkeyResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use GetInfoResponse.ProtoReflect.Descriptor instead.
+func (*GetInfoResponse) Descriptor() ([]byte, []int) {
 	return file_ark_v1_service_proto_rawDescGZIP(), []int{27}
 }

-func (x *GetPubkeyResponse) GetPubkey() string {
+func (x *GetInfoResponse) GetPubkey() string {
 	if x != nil {
 		return x.Pubkey
 	}
 	return ""
 }

+func (x *GetInfoResponse) GetLifetime() int64 {
+	if x != nil {
+		return x.Lifetime
+	}
+	return 0
+}
+
+func (x *GetInfoResponse) GetExitDelay() int64 {
+	if x != nil {
+		return x.ExitDelay
+	}
+	return 0
+}
+
 var File_ark_v1_service_proto protoreflect.FileDescriptor

 var file_ark_v1_service_proto_rawDesc = []byte{
@@ -1590,77 +1606,80 @@ var file_ark_v1_service_proto_rawDesc = []byte{
 	0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x70, 0x65, 0x6e, 0x74,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x70, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x0a,
 	0x09, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x78, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x70, 0x6f, 0x6f, 0x6c, 0x54, 0x78, 0x69, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x47, 0x65,
-	0x74, 0x50, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x2b,
-	0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x32, 0xfd, 0x06, 0x0a, 0x0a,
-	0x41, 0x72, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x73, 0x0a, 0x0f, 0x52, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x2e,
-	0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50,
-	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e,
-	0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50,
-	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x70,
-	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12,
-	0x67, 0x0a, 0x0c, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12,
-	0x1b, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x50, 0x61,
-	0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61,
-	0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x50, 0x61, 0x79, 0x6d, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x16, 0x3a, 0x01, 0x2a, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x79, 0x6d, 0x65,
-	0x6e, 0x74, 0x2f, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x12, 0x73, 0x0a, 0x0f, 0x46, 0x69, 0x6e, 0x61,
-	0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x61, 0x72,
-	0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79,
-	0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72,
-	0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79,
-	0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x79,
-	0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x12, 0x57, 0x0a,
-	0x08, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x17, 0x2e, 0x61, 0x72, 0x6b, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x18, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52,
-	0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2f,
-	0x7b, 0x74, 0x78, 0x69, 0x64, 0x7d, 0x12, 0x65, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65,
-	0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76,
-	0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31,
-	0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12,
-	0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x30, 0x01, 0x12, 0x50, 0x0a,
-	0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x50,
-	0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x61, 0x72, 0x6b,
-	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69,
-	0x6e, 0x67, 0x2f, 0x7b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x7d, 0x12,
-	0x55, 0x0a, 0x06, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74, 0x12, 0x15, 0x2e, 0x61, 0x72, 0x6b, 0x2e,
-	0x76, 0x31, 0x2e, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x16, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16,
-	0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x61, 0x75, 0x63, 0x65, 0x74, 0x2f, 0x7b, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0x5d, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x74,
-	0x78, 0x6f, 0x73, 0x12, 0x18, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x56, 0x74, 0x78, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e,
-	0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x74, 0x78, 0x6f, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15,
-	0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x74, 0x78, 0x6f, 0x73, 0x2f, 0x7b, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0x54, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6b,
-	0x65, 0x79, 0x12, 0x18, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50,
-	0x75, 0x62, 0x6b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61,
-	0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12,
-	0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x42, 0x92, 0x01, 0x0a, 0x0a,
-	0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x6b, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f,
-	0x72, 0x6b, 0x2f, 0x61, 0x72, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x72, 0x6b,
-	0x2f, 0x76, 0x31, 0x3b, 0x61, 0x72, 0x6b, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa,
-	0x02, 0x06, 0x41, 0x72, 0x6b, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x06, 0x41, 0x72, 0x6b, 0x5c, 0x56,
-	0x31, 0xe2, 0x02, 0x12, 0x41, 0x72, 0x6b, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x41, 0x72, 0x6b, 0x3a, 0x3a, 0x56, 0x31,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x08, 0x70, 0x6f, 0x6f, 0x6c, 0x54, 0x78, 0x69, 0x64, 0x22, 0x10, 0x0a, 0x0e, 0x47, 0x65,
+	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x64, 0x0a, 0x0f,
+	0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74,
+	0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74,
+	0x69, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x78, 0x69, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x61,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78, 0x69, 0x74, 0x44, 0x65, 0x6c,
+	0x61, 0x79, 0x32, 0xf5, 0x06, 0x0a, 0x0a, 0x41, 0x72, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x73, 0x0a, 0x0f, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79,
+	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
+	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
+	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a,
+	0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x72, 0x65,
+	0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x0c, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x50,
+	0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e,
+	0x43, 0x6c, 0x61, 0x69, 0x6d, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x61,
+	0x69, 0x6d, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, 0x01, 0x2a, 0x22, 0x11, 0x2f, 0x76,
+	0x31, 0x2f, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x12,
+	0x73, 0x0a, 0x0f, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79, 0x6d, 0x65,
+	0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61,
+	0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61,
+	0x6c, 0x69, 0x7a, 0x65, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14,
+	0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x66, 0x69, 0x6e, 0x61,
+	0x6c, 0x69, 0x7a, 0x65, 0x12, 0x57, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x6e, 0x64,
+	0x12, 0x17, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75,
+	0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x61, 0x72, 0x6b, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x76, 0x31,
+	0x2f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2f, 0x7b, 0x74, 0x78, 0x69, 0x64, 0x7d, 0x12, 0x65, 0x0a,
+	0x0e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
+	0x1d, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e,
+	0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x65, 0x6e,
+	0x74, 0x73, 0x30, 0x01, 0x12, 0x50, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x61,
+	0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x14, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12,
+	0x15, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x69, 0x6e, 0x67, 0x2f, 0x7b, 0x70, 0x61, 0x79, 0x6d, 0x65,
+	0x6e, 0x74, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x55, 0x0a, 0x06, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74,
+	0x12, 0x15, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31,
+	0x2e, 0x46, 0x61, 0x75, 0x63, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x61, 0x75,
+	0x63, 0x65, 0x74, 0x2f, 0x7b, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0x5d, 0x0a,
+	0x09, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x74, 0x78, 0x6f, 0x73, 0x12, 0x18, 0x2e, 0x61, 0x72, 0x6b,
+	0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x74, 0x78, 0x6f, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
+	0x73, 0x74, 0x56, 0x74, 0x78, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x74, 0x78,
+	0x6f, 0x73, 0x2f, 0x7b, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0x4c, 0x0a, 0x07,
+	0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x17, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0a,
+	0x12, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x92, 0x01, 0x0a, 0x0a, 0x63,
+	0x6f, 0x6d, 0x2e, 0x61, 0x72, 0x6b, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x72, 0x6b, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x2f, 0x61, 0x72, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x72, 0x6b, 0x2f,
+	0x76, 0x31, 0x3b, 0x61, 0x72, 0x6b, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02,
+	0x06, 0x41, 0x72, 0x6b, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x06, 0x41, 0x72, 0x6b, 0x5c, 0x56, 0x31,
+	0xe2, 0x02, 0x12, 0x41, 0x72, 0x6b, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x41, 0x72, 0x6b, 0x3a, 0x3a, 0x56, 0x31, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@@ -1703,8 +1722,8 @@ var file_ark_v1_service_proto_goTypes = []interface{}{
 	(*ListVtxosRequest)(nil),        // 23: ark.v1.ListVtxosRequest
 	(*ListVtxosResponse)(nil),       // 24: ark.v1.ListVtxosResponse
 	(*Vtxo)(nil),                    // 25: ark.v1.Vtxo
-	(*GetPubkeyRequest)(nil),        // 26: ark.v1.GetPubkeyRequest
-	(*GetPubkeyResponse)(nil),       // 27: ark.v1.GetPubkeyResponse
+	(*GetInfoRequest)(nil),          // 26: ark.v1.GetInfoRequest
+	(*GetInfoResponse)(nil),         // 27: ark.v1.GetInfoResponse
 }
 var file_ark_v1_service_proto_depIdxs = []int32{
 	9,  // 0: ark.v1.RegisterPaymentRequest.inputs:type_name -> ark.v1.Input
@@ -1728,7 +1747,7 @@ var file_ark_v1_service_proto_depIdxs = []int32{
 	19, // 18: ark.v1.ArkService.Ping:input_type -> ark.v1.PingRequest
 	21, // 19: ark.v1.ArkService.Faucet:input_type -> ark.v1.FaucetRequest
 	23, // 20: ark.v1.ArkService.ListVtxos:input_type -> ark.v1.ListVtxosRequest
-	26, // 21: ark.v1.ArkService.GetPubkey:input_type -> ark.v1.GetPubkeyRequest
+	26, // 21: ark.v1.ArkService.GetInfo:input_type -> ark.v1.GetInfoRequest
 	1,  // 22: ark.v1.ArkService.RegisterPayment:output_type -> ark.v1.RegisterPaymentResponse
 	3,  // 23: ark.v1.ArkService.ClaimPayment:output_type -> ark.v1.ClaimPaymentResponse
 	5,  // 24: ark.v1.ArkService.FinalizePayment:output_type -> ark.v1.FinalizePaymentResponse
@@ -1737,7 +1756,7 @@ var file_ark_v1_service_proto_depIdxs = []int32{
 	20, // 27: ark.v1.ArkService.Ping:output_type -> ark.v1.PingResponse
 	22, // 28: ark.v1.ArkService.Faucet:output_type -> ark.v1.FaucetResponse
 	24, // 29: ark.v1.ArkService.ListVtxos:output_type -> ark.v1.ListVtxosResponse
-	27, // 30: ark.v1.ArkService.GetPubkey:output_type -> ark.v1.GetPubkeyResponse
+	27, // 30: ark.v1.ArkService.GetInfo:output_type -> ark.v1.GetInfoResponse
 	22, // [22:31] is the sub-list for method output_type
 	13, // [13:22] is the sub-list for method input_type
 	13, // [13:13] is the sub-list for extension type_name
@@ -2064,7 +2083,7 @@ func file_ark_v1_service_proto_init() {
 			}
 		}
 		file_ark_v1_service_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPubkeyRequest); i {
+			switch v := v.(*GetInfoRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2076,7 +2095,7 @@ func file_ark_v1_service_proto_init() {
 			}
 		}
 		file_ark_v1_service_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetPubkeyResponse); i {
+			switch v := v.(*GetInfoResponse); i {
 			case 0:
 				return &v.state
 			case 1:
--- a/server/api-spec/protobuf/gen/ark/v1/service.pb.gw.go
+++ b/server/api-spec/protobuf/gen/ark/v1/service.pb.gw.go
@@ -334,20 +334,20 @@ func local_request_ArkService_ListVtxos_0(ctx context.Context, marshaler runtime

 }

-func request_ArkService_GetPubkey_0(ctx context.Context, marshaler runtime.Marshaler, client ArkServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetPubkeyRequest
+func request_ArkService_GetInfo_0(ctx context.Context, marshaler runtime.Marshaler, client ArkServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetInfoRequest
 	var metadata runtime.ServerMetadata

-	msg, err := client.GetPubkey(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.GetInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err

 }

-func local_request_ArkService_GetPubkey_0(ctx context.Context, marshaler runtime.Marshaler, server ArkServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetPubkeyRequest
+func local_request_ArkService_GetInfo_0(ctx context.Context, marshaler runtime.Marshaler, server ArkServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq GetInfoRequest
 	var metadata runtime.ServerMetadata

-	msg, err := server.GetPubkey(ctx, &protoReq)
+	msg, err := server.GetInfo(ctx, &protoReq)
 	return msg, metadata, err

 }
@@ -540,7 +540,7 @@ func RegisterArkServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,

 	})

-	mux.Handle("GET", pattern_ArkService_GetPubkey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_ArkService_GetInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
@@ -548,12 +548,12 @@ func RegisterArkServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/ark.v1.ArkService/GetPubkey", runtime.WithHTTPPathPattern("/v1/pubkey"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/ark.v1.ArkService/GetInfo", runtime.WithHTTPPathPattern("/v1/info"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_ArkService_GetPubkey_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_ArkService_GetInfo_0(annotatedContext, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
 		if err != nil {
@@ -561,7 +561,7 @@ func RegisterArkServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}

-		forward_ArkService_GetPubkey_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ArkService_GetInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

 	})

@@ -782,25 +782,25 @@ func RegisterArkServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,

 	})

-	mux.Handle("GET", pattern_ArkService_GetPubkey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("GET", pattern_ArkService_GetInfo_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)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/ark.v1.ArkService/GetPubkey", runtime.WithHTTPPathPattern("/v1/pubkey"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/ark.v1.ArkService/GetInfo", runtime.WithHTTPPathPattern("/v1/info"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ArkService_GetPubkey_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ArkService_GetInfo_0(annotatedContext, inboundMarshaler, client, req, pathParams)
 		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
 		if err != nil {
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}

-		forward_ArkService_GetPubkey_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ArkService_GetInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

 	})

@@ -824,7 +824,7 @@ var (

 	pattern_ArkService_ListVtxos_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "vtxos", "address"}, ""))

-	pattern_ArkService_GetPubkey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "pubkey"}, ""))
+	pattern_ArkService_GetInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "info"}, ""))
 )

 var (
@@ -844,5 +844,5 @@ var (

 	forward_ArkService_ListVtxos_0 = runtime.ForwardResponseMessage

-	forward_ArkService_GetPubkey_0 = runtime.ForwardResponseMessage
+	forward_ArkService_GetInfo_0 = runtime.ForwardResponseMessage
 )
--- a/server/api-spec/protobuf/gen/ark/v1/service_grpc.pb.go
+++ b/server/api-spec/protobuf/gen/ark/v1/service_grpc.pb.go
@@ -26,7 +26,7 @@ type ArkServiceClient interface {
 	Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingResponse, error)
 	Faucet(ctx context.Context, in *FaucetRequest, opts ...grpc.CallOption) (*FaucetResponse, error)
 	ListVtxos(ctx context.Context, in *ListVtxosRequest, opts ...grpc.CallOption) (*ListVtxosResponse, error)
-	GetPubkey(ctx context.Context, in *GetPubkeyRequest, opts ...grpc.CallOption) (*GetPubkeyResponse, error)
+	GetInfo(ctx context.Context, in *GetInfoRequest, opts ...grpc.CallOption) (*GetInfoResponse, error)
 }

 type arkServiceClient struct {
@@ -132,9 +132,9 @@ func (c *arkServiceClient) ListVtxos(ctx context.Context, in *ListVtxosRequest,
 	return out, nil
 }

-func (c *arkServiceClient) GetPubkey(ctx context.Context, in *GetPubkeyRequest, opts ...grpc.CallOption) (*GetPubkeyResponse, error) {
-	out := new(GetPubkeyResponse)
-	err := c.cc.Invoke(ctx, "/ark.v1.ArkService/GetPubkey", in, out, opts...)
+func (c *arkServiceClient) GetInfo(ctx context.Context, in *GetInfoRequest, opts ...grpc.CallOption) (*GetInfoResponse, error) {
+	out := new(GetInfoResponse)
+	err := c.cc.Invoke(ctx, "/ark.v1.ArkService/GetInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -153,7 +153,7 @@ type ArkServiceServer interface {
 	Ping(context.Context, *PingRequest) (*PingResponse, error)
 	Faucet(context.Context, *FaucetRequest) (*FaucetResponse, error)
 	ListVtxos(context.Context, *ListVtxosRequest) (*ListVtxosResponse, error)
-	GetPubkey(context.Context, *GetPubkeyRequest) (*GetPubkeyResponse, error)
+	GetInfo(context.Context, *GetInfoRequest) (*GetInfoResponse, error)
 }

 // UnimplementedArkServiceServer should be embedded to have forward compatible implementations.
@@ -184,8 +184,8 @@ func (UnimplementedArkServiceServer) Faucet(context.Context, *FaucetRequest) (*F
 func (UnimplementedArkServiceServer) ListVtxos(context.Context, *ListVtxosRequest) (*ListVtxosResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListVtxos not implemented")
 }
-func (UnimplementedArkServiceServer) GetPubkey(context.Context, *GetPubkeyRequest) (*GetPubkeyResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetPubkey not implemented")
+func (UnimplementedArkServiceServer) GetInfo(context.Context, *GetInfoRequest) (*GetInfoResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetInfo not implemented")
 }

 // UnsafeArkServiceServer may be embedded to opt out of forward compatibility for this service.
@@ -346,20 +346,20 @@ func _ArkService_ListVtxos_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }

-func _ArkService_GetPubkey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetPubkeyRequest)
+func _ArkService_GetInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInfoRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(ArkServiceServer).GetPubkey(ctx, in)
+		return srv.(ArkServiceServer).GetInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/ark.v1.ArkService/GetPubkey",
+		FullMethod: "/ark.v1.ArkService/GetInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ArkServiceServer).GetPubkey(ctx, req.(*GetPubkeyRequest))
+		return srv.(ArkServiceServer).GetInfo(ctx, req.(*GetInfoRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -400,8 +400,8 @@ var ArkService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _ArkService_ListVtxos_Handler,
 		},
 		{
-			MethodName: "GetPubkey",
-			Handler:    _ArkService_GetPubkey_Handler,
+			MethodName: "GetInfo",
+			Handler:    _ArkService_GetInfo_Handler,
 		},
 	},
 	Streams: []grpc.StreamDesc{
--- a/server/cmd/arkd/main.go
+++ b/server/cmd/arkd/main.go
@@ -37,6 +37,12 @@ func main() {
 		log.Infof("round lifetime must be a multiple of 512, %d -> %d", setLifetime, cfg.RoundLifetime)
 	}

+	if cfg.ExitDelay%512 != 0 {
+		setExitDelay := cfg.ExitDelay
+		cfg.ExitDelay = cfg.ExitDelay - (cfg.ExitDelay % 512)
+		log.Infof("exit delay must be a multiple of 512, %d -> %d", setExitDelay, cfg.ExitDelay)
+	}
+
 	appConfig := &appconfig.Config{
 		DbType:                cfg.DbType,
 		DbDir:                 cfg.DbDir,
@@ -48,6 +54,7 @@ func main() {
 		WalletAddr:            cfg.WalletAddr,
 		MinRelayFee:           cfg.MinRelayFee,
 		RoundLifetime:         cfg.RoundLifetime,
+		ExitDelay:             cfg.ExitDelay,
 	}
 	svc, err := grpcservice.NewService(svcConfig, appConfig)
 	if err != nil {
--- a/server/internal/app-config/config.go
+++ b/server/internal/app-config/config.go
@@ -43,6 +43,7 @@ type Config struct {
 	WalletAddr            string
 	MinRelayFee           uint64
 	RoundLifetime         int64
+	ExitDelay             int64

 	repo      ports.RepoManager
 	svc       application.Service
@@ -96,8 +97,8 @@ func (c *Config) Validate() error {
 		return err
 	}
 	// round life time must be a multiple of 512
-	if c.RoundLifetime <= 0 || c.RoundLifetime%512 != 0 {
-		return fmt.Errorf("invalid round lifetime, must be greater than 0 and a multiple of 512")
+	if c.RoundLifetime < 512 || c.RoundLifetime%512 != 0 {
+		return fmt.Errorf("invalid round lifetime, must be greater or equal than 512 and a multiple of 512")
 	}
 	seq, err := common.BIP68Encode(uint(c.RoundLifetime))
 	if err != nil {
@@ -113,6 +114,10 @@ func (c *Config) Validate() error {
 		return fmt.Errorf("invalid round lifetime, must be a multiple of 512")
 	}

+	if c.ExitDelay < 512 || c.ExitDelay%512 != 0 {
+		return fmt.Errorf("invalid exit delay, must be greater or equal than 512 and a multiple of 512")
+	}
+
 	return nil
 }

@@ -165,7 +170,7 @@ func (c *Config) txBuilderService() error {
 	case "dummy":
 		svc = txbuilderdummy.NewTxBuilder(c.wallet, net)
 	case "covenant":
-		svc = txbuilder.NewTxBuilder(c.wallet, net, c.RoundLifetime)
+		svc = txbuilder.NewTxBuilder(c.wallet, net, c.RoundLifetime, c.ExitDelay)
 	default:
 		err = fmt.Errorf("unknown tx builder type")
 	}
@@ -214,7 +219,7 @@ func (c *Config) schedulerService() error {
 func (c *Config) appService() error {
 	net := c.mainChain()
 	svc, err := application.NewService(
-		c.Network, net, c.RoundInterval, c.RoundLifetime, c.MinRelayFee,
+		c.Network, net, c.RoundInterval, c.RoundLifetime, c.ExitDelay, c.MinRelayFee,
 		c.wallet, c.repo, c.txBuilder, c.scanner, c.scheduler,
 	)
 	if err != nil {
--- a/server/internal/config/config.go
+++ b/server/internal/config/config.go
@@ -24,6 +24,7 @@ type Config struct {
 	LogLevel              int
 	MinRelayFee           uint64
 	RoundLifetime         int64
+	ExitDelay             int64
 }

 var (
@@ -40,6 +41,7 @@ var (
 	Network               = "NETWORK"
 	MinRelayFee           = "MIN_RELAY_FEE"
 	RoundLifetime         = "ROUND_LIFETIME"
+	ExitDelay             = "EXIT_DELAY"

 	defaultDatadir               = common.AppDataDir("arkd", false)
 	defaultRoundInterval         = 10
@@ -53,6 +55,7 @@ var (
 	defaultLogLevel              = 5
 	defaultMinRelayFee           = 30
 	defaultRoundLifetime         = 512
+	defaultExitDelay             = 512
 )

 func LoadConfig() (*Config, error) {
@@ -71,6 +74,7 @@ func LoadConfig() (*Config, error) {
 	viper.SetDefault(Network, defaultNetwork)
 	viper.SetDefault(RoundLifetime, defaultRoundLifetime)
 	viper.SetDefault(MinRelayFee, defaultMinRelayFee)
+	viper.SetDefault(ExitDelay, defaultExitDelay)

 	net, err := getNetwork()
 	if err != nil {
@@ -95,6 +99,7 @@ func LoadConfig() (*Config, error) {
 		Network:               net,
 		MinRelayFee:           viper.GetUint64(MinRelayFee),
 		RoundLifetime:         viper.GetInt64(RoundLifetime),
+		ExitDelay:             viper.GetInt64(ExitDelay),
 	}, nil
 }

--- a/server/internal/core/application/service.go
+++ b/server/internal/core/application/service.go
@@ -37,7 +37,7 @@ type Service interface {
 	GetEventsChannel(ctx context.Context) <-chan domain.RoundEvent
 	UpdatePaymentStatus(ctx context.Context, id string) error
 	ListVtxos(ctx context.Context, pubkey *secp256k1.PublicKey) ([]domain.Vtxo, error)
-	GetPubkey(ctx context.Context) (string, error)
+	GetInfo(ctx context.Context) (string, int64, int64, error)
 }

 type service struct {
@@ -47,6 +47,7 @@ type service struct {
 	roundLifetime int64
 	roundInterval int64
 	minRelayFee   uint64
+	exitDelay     int64

 	wallet      ports.WalletService
 	repoManager ports.RepoManager
@@ -62,7 +63,7 @@ type service struct {

 func NewService(
 	network common.Network, onchainNetwork network.Network,
-	roundInterval, roundLifetime int64, minRelayFee uint64,
+	roundInterval, roundLifetime int64, exitDelay int64, minRelayFee uint64,
 	walletSvc ports.WalletService, repoManager ports.RepoManager,
 	builder ports.TxBuilder, scanner ports.BlockchainScanner,
 	scheduler ports.SchedulerService,
@@ -81,7 +82,7 @@ func NewService(

 	svc := &service{
 		network, onchainNetwork, pubkey,
-		roundLifetime, roundInterval, minRelayFee,
+		roundLifetime, roundInterval, minRelayFee, exitDelay,
 		walletSvc, repoManager, builder, scanner, sweeper,
 		paymentRequests, forfeitTxs, eventsCh,
 	}
@@ -218,8 +219,8 @@ func (s *service) GetRoundByTxid(ctx context.Context, poolTxid string) (*domain.
 	return s.repoManager.Rounds().GetRoundWithTxid(ctx, poolTxid)
 }

-func (s *service) GetPubkey(ctx context.Context) (string, error) {
-	return hex.EncodeToString(s.pubkey.SerializeCompressed()), nil
+func (s *service) GetInfo(ctx context.Context) (string, int64, int64, error) {
+	return hex.EncodeToString(s.pubkey.SerializeCompressed()), s.roundLifetime, s.exitDelay, nil
 }

 func (s *service) start() {
--- a/server/internal/core/application/sweeper.go
+++ b/server/internal/core/application/sweeper.go
@@ -2,7 +2,6 @@ package application

 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"time"

@@ -10,7 +9,6 @@ import (
 	"github.com/ark-network/ark/internal/core/domain"
 	"github.com/ark-network/ark/internal/core/ports"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	log "github.com/sirupsen/logrus"
 	"github.com/vulpemventures/go-elements/psetv2"
 )
@@ -326,17 +324,6 @@ func (s *sweeper) findSweepableOutputs(
 					newNodesToCheck = append(newNodesToCheck, children...)
 					continue
 				}
-
-				// if the node is a leaf, the vtxos outputs should added as onchain outputs if they are not swept yet
-				vtxoExpiration, sweepInput, err := s.leafToSweepInput(ctx, blocktime, node)
-				if err != nil {
-					return nil, err
-				}
-
-				if sweepInput != nil {
-					expirationTime = vtxoExpiration
-					sweepInputs = []ports.SweepInput{*sweepInput}
-				}
 			}

 			if _, ok := sweepableOutputs[expirationTime]; !ok {
@@ -351,62 +338,6 @@ func (s *sweeper) findSweepableOutputs(
 	return sweepableOutputs, nil
 }

-func (s *sweeper) leafToSweepInput(ctx context.Context, txBlocktime int64, node tree.Node) (int64, *ports.SweepInput, error) {
-	pset, err := psetv2.NewPsetFromBase64(node.Tx)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	vtxo, err := extractVtxoOutpoint(pset)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	fromRepo, err := s.repoManager.Vtxos().GetVtxos(ctx, []domain.VtxoKey{*vtxo})
-	if err != nil {
-		return -1, nil, err
-	}
-
-	if len(fromRepo) == 0 {
-		return -1, nil, fmt.Errorf("vtxo not found")
-	}
-
-	if fromRepo[0].Swept {
-		return -1, nil, nil
-	}
-
-	if fromRepo[0].Redeemed {
-		return -1, nil, nil
-	}
-
-	// if the vtxo is not swept or redeemed, add it to the onchain outputs
-	pubKeyBytes, err := hex.DecodeString(fromRepo[0].Pubkey)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	pubKey, err := secp256k1.ParsePubKey(pubKeyBytes)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	sweepLeaf, lifetime, err := s.builder.GetLeafSweepClosure(node, pubKey)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	sweepInput := ports.SweepInput{
-		InputArgs: psetv2.InputArgs{
-			Txid:    vtxo.Txid,
-			TxIndex: vtxo.VOut,
-		},
-		SweepLeaf: *sweepLeaf,
-		Amount:    fromRepo[0].Amount,
-	}
-
-	return txBlocktime + lifetime, &sweepInput, nil
-}
-
 func (s *sweeper) nodeToSweepInputs(parentBlocktime int64, node tree.Node) (int64, []ports.SweepInput, error) {
 	pset, err := psetv2.NewPsetFromBase64(node.Tx)
 	if err != nil {
@@ -543,14 +474,14 @@ func containsTree(tr0 tree.CongestionTree, tr1 tree.CongestionTree) (bool, error
 // given a congestion tree input, searches and returns the sweep leaf and its lifetime in seconds
 func extractSweepLeaf(input psetv2.Input) (sweepLeaf *psetv2.TapLeafScript, lifetime int64, err error) {
 	for _, leaf := range input.TapLeafScript {
-		isSweep, _, seconds, err := tree.DecodeSweepScript(leaf.Script)
+		closure := &tree.CSVSigClosure{}
+		valid, err := closure.Decode(leaf.Script)
 		if err != nil {
 			return nil, 0, err
 		}
-		if isSweep {
-			lifetime = int64(seconds)
+		if valid && closure.Seconds > uint(lifetime) {
 			sweepLeaf = &leaf
-			break
+			lifetime = int64(closure.Seconds)
 		}
 	}

--- a/server/internal/core/ports/tx_builder.go
+++ b/server/internal/core/ports/tx_builder.go
@@ -24,6 +24,5 @@ type TxBuilder interface {
 		wallet WalletService,
 		inputs []SweepInput,
 	) (signedSweepTx string, err error)
-	GetLeafSweepClosure(node tree.Node, userPubKey *secp256k1.PublicKey) (*psetv2.TapLeafScript, int64, error)
 	GetVtxoScript(userPubkey, aspPubkey *secp256k1.PublicKey) ([]byte, error)
 }
--- a/server/internal/infrastructure/ocean-wallet/transaction.go
+++ b/server/internal/infrastructure/ocean-wallet/transaction.go
@@ -224,7 +224,7 @@ func (s *service) EstimateFees(
 		}

 		if len(in.TapLeafScript) == 1 {
-			isSweep, _, _, err := tree.DecodeSweepScript(in.TapLeafScript[0].Script)
+			isSweep, err := (&tree.CSVSigClosure{}).Decode(in.TapLeafScript[0].Script)
 			if err != nil {
 				return 0, err
 			}
--- a/server/internal/infrastructure/tx-builder/covenant/builder.go
+++ b/server/internal/infrastructure/tx-builder/covenant/builder.go
@@ -24,12 +24,13 @@ type txBuilder struct {
 	wallet        ports.WalletService
 	net           *network.Network
 	roundLifetime int64 // in seconds
+	exitDelay     int64 // in seconds
 }

 func NewTxBuilder(
-	wallet ports.WalletService, net network.Network, roundLifetime int64,
+	wallet ports.WalletService, net network.Network, roundLifetime int64, exitDelay int64,
 ) ports.TxBuilder {
-	return &txBuilder{wallet, &net, roundLifetime}
+	return &txBuilder{wallet, &net, roundLifetime, exitDelay}
 }

 func (b *txBuilder) GetVtxoScript(userPubkey, aspPubkey *secp256k1.PublicKey) ([]byte, error) {
@@ -113,7 +114,7 @@ func (b *txBuilder) BuildPoolTx(
 	// This is safe as the memory allocated for `craftCongestionTree` is freed
 	// only after `BuildPoolTx` returns.
 	treeFactoryFn, sharedOutputScript, sharedOutputAmount, err := craftCongestionTree(
-		b.net.AssetID, aspPubkey, payments, minRelayFee, b.roundLifetime,
+		b.net.AssetID, aspPubkey, payments, minRelayFee, b.roundLifetime, b.exitDelay,
 	)
 	if err != nil {
 		return
@@ -148,60 +149,31 @@ func (b *txBuilder) BuildPoolTx(
 	return
 }

-func (b *txBuilder) GetLeafSweepClosure(
-	node tree.Node, userPubKey *secp256k1.PublicKey,
-) (*psetv2.TapLeafScript, int64, error) {
-	if !node.Leaf {
-		return nil, 0, fmt.Errorf("node is not a leaf")
-	}
-
-	pset, err := psetv2.NewPsetFromBase64(node.Tx)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	input := pset.Inputs[0]
-
-	sweepLeaf, lifetime, err := extractSweepLeaf(input)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	// craft the vtxo taproot tree
-	vtxoScript, err := tree.VtxoScript(userPubKey)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	vtxoTaprootTree := taproot.AssembleTaprootScriptTree(
-		*vtxoScript,
-		sweepLeaf.TapElementsLeaf,
-	)
-
-	proofIndex := vtxoTaprootTree.LeafProofIndex[sweepLeaf.TapHash()]
-	proof := vtxoTaprootTree.LeafMerkleProofs[proofIndex]
-
-	return &psetv2.TapLeafScript{
-		TapElementsLeaf: proof.TapElementsLeaf,
-		ControlBlock:    proof.ToControlBlock(sweepLeaf.ControlBlock.InternalKey),
-	}, lifetime, nil
-}
-
 func (b *txBuilder) getLeafScriptAndTree(
 	userPubkey, aspPubkey *secp256k1.PublicKey,
 ) ([]byte, *taproot.IndexedElementsTapScriptTree, error) {
-	redeemClosure, err := tree.VtxoScript(userPubkey)
+	redeemClosure := &tree.CSVSigClosure{
+		Pubkey:  userPubkey,
+		Seconds: uint(b.exitDelay),
+	}
+
+	redeemLeaf, err := redeemClosure.Leaf()
 	if err != nil {
 		return nil, nil, err
 	}

-	sweepClosure, err := tree.SweepScript(aspPubkey, uint(b.roundLifetime))
+	forfeitClosure := &tree.ForfeitClosure{
+		Pubkey:    userPubkey,
+		AspPubkey: aspPubkey,
+	}
+
+	forfeitLeaf, err := forfeitClosure.Leaf()
 	if err != nil {
 		return nil, nil, err
 	}

 	taprootTree := taproot.AssembleTaprootScriptTree(
-		*redeemClosure, *sweepClosure,
+		*redeemLeaf, *forfeitLeaf,
 	)

 	root := taprootTree.RootNode.TapHash()
@@ -471,9 +443,25 @@ func (b *txBuilder) createForfeitTxs(
 				return nil, err
 			}

+			var forfeitProof *taproot.TapscriptElementsProof
+
+			for _, proof := range vtxoTaprootTree.LeafMerkleProofs {
+				isForfeit, err := (&tree.ForfeitClosure{}).Decode(proof.Script)
+				if !isForfeit || err != nil {
+					continue
+				}
+
+				forfeitProof = &proof
+				break
+			}
+
+			if forfeitProof == nil {
+				return nil, fmt.Errorf("forfeit proof not found")
+			}
+
 			for _, connector := range connectors {
 				txs, err := craftForfeitTxs(
-					connector, vtxo, vtxoTaprootTree, vtxoScript, aspScript,
+					connector, vtxo, *forfeitProof, vtxoScript, aspScript,
 				)
 				if err != nil {
 					return nil, err
@@ -485,24 +473,3 @@ func (b *txBuilder) createForfeitTxs(
 	}
 	return forfeitTxs, nil
 }
-
-// given a congestion tree input, searches and returns the sweep leaf and its lifetime in seconds
-func extractSweepLeaf(input psetv2.Input) (sweepLeaf *psetv2.TapLeafScript, lifetime int64, err error) {
-	for _, leaf := range input.TapLeafScript {
-		isSweep, _, seconds, err := tree.DecodeSweepScript(leaf.Script)
-		if err != nil {
-			return nil, 0, err
-		}
-		if isSweep {
-			lifetime = int64(seconds)
-			sweepLeaf = &leaf
-			break
-		}
-	}
-
-	if sweepLeaf == nil {
-		return nil, 0, fmt.Errorf("sweep leaf not found")
-	}
-
-	return sweepLeaf, lifetime, nil
-}
--- a/server/internal/infrastructure/tx-builder/covenant/builder_test.go
+++ b/server/internal/infrastructure/tx-builder/covenant/builder_test.go
@@ -23,6 +23,7 @@ const (
 	testingKey    = "0218d5ca8b58797b7dbd65c075dd7ba7784b3f38ab71b1a5a8e3f94ba0257654a6"
 	minRelayFee   = uint64(30)
 	roundLifetime = int64(1209344)
+	exitDelay     = int64(512)
 )

 var (
@@ -44,7 +45,7 @@ func TestMain(m *testing.M) {
 }

 func TestBuildPoolTx(t *testing.T) {
-	builder := txbuilder.NewTxBuilder(wallet, network.Liquid, roundLifetime)
+	builder := txbuilder.NewTxBuilder(wallet, network.Liquid, roundLifetime, exitDelay)

 	fixtures, err := parsePoolTxFixtures()
 	require.NoError(t, err)
@@ -79,7 +80,7 @@ func TestBuildPoolTx(t *testing.T) {
 }

 func TestBuildForfeitTxs(t *testing.T) {
-	builder := txbuilder.NewTxBuilder(wallet, network.Liquid, 1209344)
+	builder := txbuilder.NewTxBuilder(wallet, network.Liquid, 1209344, exitDelay)

 	fixtures, err := parseForfeitTxsFixtures()
 	require.NoError(t, err)
--- a/server/internal/infrastructure/tx-builder/covenant/forfeit.go
+++ b/server/internal/infrastructure/tx-builder/covenant/forfeit.go
@@ -13,7 +13,7 @@ import (
 func craftForfeitTxs(
 	connectorTx *psetv2.Pset,
 	vtxo domain.Vtxo,
-	vtxoTaprootTree *taproot.IndexedElementsTapScriptTree,
+	vtxoForfeitTapleaf taproot.TapscriptElementsProof,
 	vtxoScript, aspScript []byte,
 ) (forfeitTxs []string, err error) {
 	connectors, prevouts := getConnectorInputs(connectorTx)
@@ -66,11 +66,9 @@ func craftForfeitTxs(

 		unspendableKey := tree.UnspendableKey()

-		for _, proof := range vtxoTaprootTree.LeafMerkleProofs {
-			tapScript := psetv2.NewTapLeafScript(proof, unspendableKey)
-			if err := updater.AddInTapLeafScript(1, tapScript); err != nil {
-				return nil, err
-			}
+		tapScript := psetv2.NewTapLeafScript(vtxoForfeitTapleaf, unspendableKey)
+		if err := updater.AddInTapLeafScript(1, tapScript); err != nil {
+			return nil, err
 		}

 		connectorAmount, err := elementsutil.ValueFromBytes(connectorPrevout.Value)
--- a/server/internal/infrastructure/tx-builder/covenant/sweep.go
+++ b/server/internal/infrastructure/tx-builder/covenant/sweep.go
@@ -33,55 +33,56 @@ func sweepTransaction(

 	for i, input := range sweepInputs {
 		leaf := input.SweepLeaf
-		isSweep, _, lifetime, err := tree.DecodeSweepScript(leaf.Script)
+		sweepClosure := &tree.CSVSigClosure{}
+		isSweep, err := sweepClosure.Decode(leaf.Script)
 		if err != nil {
 			return nil, err
 		}

-		if isSweep {
-			amount += input.Amount
-
-			if err := updater.AddInputs([]psetv2.InputArgs{input.InputArgs}); err != nil {
-				return nil, err
-			}
-
-			if err := updater.AddInTapLeafScript(i, leaf); err != nil {
-				return nil, err
-			}
-
-			assetHash, err := elementsutil.AssetHashToBytes(lbtc)
-			if err != nil {
-				return nil, err
-			}
-
-			value, err := elementsutil.ValueToBytes(input.Amount)
-			if err != nil {
-				return nil, err
-			}
-
-			root := leaf.ControlBlock.RootHash(leaf.Script)
-			taprootKey := taproot.ComputeTaprootOutputKey(leaf.ControlBlock.InternalKey, root)
-			script, err := taprootOutputScript(taprootKey)
-			if err != nil {
-				return nil, err
-			}
-
-			witnessUtxo := transaction.NewTxOutput(assetHash, value, script)
-
-			if err := updater.AddInWitnessUtxo(i, witnessUtxo); err != nil {
-				return nil, err
-			}
-
-			sequence, err := common.BIP68EncodeAsNumber(lifetime)
-			if err != nil {
-				return nil, err
-			}
-
-			updater.Pset.Inputs[i].Sequence = sequence
-			continue
+		if !isSweep {
+			return nil, fmt.Errorf("invalid sweep script")
 		}

-		return nil, fmt.Errorf("invalid sweep script")
+		amount += input.Amount
+
+		if err := updater.AddInputs([]psetv2.InputArgs{input.InputArgs}); err != nil {
+			return nil, err
+		}
+
+		if err := updater.AddInTapLeafScript(i, leaf); err != nil {
+			return nil, err
+		}
+
+		assetHash, err := elementsutil.AssetHashToBytes(lbtc)
+		if err != nil {
+			return nil, err
+		}
+
+		value, err := elementsutil.ValueToBytes(input.Amount)
+		if err != nil {
+			return nil, err
+		}
+
+		root := leaf.ControlBlock.RootHash(leaf.Script)
+		taprootKey := taproot.ComputeTaprootOutputKey(leaf.ControlBlock.InternalKey, root)
+		script, err := taprootOutputScript(taprootKey)
+		if err != nil {
+			return nil, err
+		}
+
+		witnessUtxo := transaction.NewTxOutput(assetHash, value, script)
+
+		if err := updater.AddInWitnessUtxo(i, witnessUtxo); err != nil {
+			return nil, err
+		}
+
+		sequence, err := common.BIP68EncodeAsNumber(sweepClosure.Seconds)
+		if err != nil {
+			return nil, err
+		}
+
+		updater.Pset.Inputs[i].Sequence = sequence
+		continue
 	}

 	ctx := context.Background()
--- a/server/internal/infrastructure/tx-builder/covenant/tree.go
+++ b/server/internal/infrastructure/tx-builder/covenant/tree.go
@@ -22,6 +22,7 @@ type node struct {
 	asset         string
 	feeSats       uint64
 	roundLifetime int64
+	exitDelay     int64

 	_inputTaprootKey  *secp256k1.PublicKey
 	_inputTaprootTree *taproot.IndexedElementsTapScriptTree
@@ -130,7 +131,12 @@ func (n *node) getWitnessData() (
 		return n._inputTaprootKey, n._inputTaprootTree, nil
 	}

-	sweepClosure, err := tree.SweepScript(n.sweepKey, uint(n.roundLifetime))
+	sweepClosure := &tree.CSVSigClosure{
+		Pubkey:  n.sweepKey,
+		Seconds: uint(n.roundLifetime),
+	}
+
+	sweepLeaf, err := sweepClosure.Leaf()
 	if err != nil {
 		return nil, nil, err
 	}
@@ -141,12 +147,18 @@ func (n *node) getWitnessData() (
 			return nil, nil, err
 		}

-		branchTaprootScript := tree.BranchScript(
-			taprootKey, nil, n.getAmount(), 0,
-		)
+		unrollClosure := &tree.UnrollClosure{
+			LeftKey:    taprootKey,
+			LeftAmount: n.getAmount(),
+		}
+
+		unrollLeaf, err := unrollClosure.Leaf()
+		if err != nil {
+			return nil, nil, err
+		}

 		branchTaprootTree := taproot.AssembleTaprootScriptTree(
-			branchTaprootScript, *sweepClosure,
+			*unrollLeaf, *sweepLeaf,
 		)
 		root := branchTaprootTree.RootNode.TapHash()

@@ -173,12 +185,21 @@ func (n *node) getWitnessData() (

 	leftAmount := n.left.getAmount() + n.feeSats
 	rightAmount := n.right.getAmount() + n.feeSats
-	branchTaprootLeaf := tree.BranchScript(
-		leftKey, rightKey, leftAmount, rightAmount,
-	)
+
+	unrollClosure := &tree.UnrollClosure{
+		LeftKey:     leftKey,
+		LeftAmount:  leftAmount,
+		RightKey:    rightKey,
+		RightAmount: rightAmount,
+	}
+
+	unrollLeaf, err := unrollClosure.Leaf()
+	if err != nil {
+		return nil, nil, err
+	}

 	branchTaprootTree := taproot.AssembleTaprootScriptTree(
-		branchTaprootLeaf, *sweepClosure,
+		*unrollLeaf, *sweepLeaf,
 	)
 	root := branchTaprootTree.RootNode.TapHash()

@@ -200,11 +221,6 @@ func (n *node) getVtxoWitnessData() (
 		return nil, nil, fmt.Errorf("cannot call vtxoWitness on a non-leaf node")
 	}

-	sweepClosure, err := tree.SweepScript(n.sweepKey, uint(n.roundLifetime))
-	if err != nil {
-		return nil, nil, err
-	}
-
 	key, err := hex.DecodeString(n.receivers[0].Pubkey)
 	if err != nil {
 		return nil, nil, err
@@ -215,14 +231,28 @@ func (n *node) getVtxoWitnessData() (
 		return nil, nil, err
 	}

-	vtxoLeaf, err := tree.VtxoScript(pubkey)
+	redeemClosure := &tree.CSVSigClosure{
+		Pubkey:  pubkey,
+		Seconds: uint(n.exitDelay),
+	}
+
+	redeemLeaf, err := redeemClosure.Leaf()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	forfeitClosure := &tree.ForfeitClosure{
+		Pubkey:    pubkey,
+		AspPubkey: n.sweepKey,
+	}
+
+	forfeitLeaf, err := forfeitClosure.Leaf()
 	if err != nil {
 		return nil, nil, err
 	}

-	// TODO: add forfeit path
 	leafTaprootTree := taproot.AssembleTaprootScriptTree(
-		*vtxoLeaf, *sweepClosure,
+		*redeemLeaf, *forfeitLeaf,
 	)
 	root := leafTaprootTree.RootNode.TapHash()

@@ -357,14 +387,14 @@ func (n *node) createFinalCongestionTree() treeFactory {

 func craftCongestionTree(
 	asset string, aspPublicKey *secp256k1.PublicKey,
-	payments []domain.Payment, feeSatsPerNode uint64, roundLifetime int64,
+	payments []domain.Payment, feeSatsPerNode uint64, roundLifetime int64, exitDelay int64,
 ) (
 	buildCongestionTree treeFactory,
 	sharedOutputScript []byte, sharedOutputAmount uint64, err error,
 ) {
 	receivers := getOffchainReceivers(payments)
 	root, err := createPartialCongestionTree(
-		receivers, aspPublicKey, asset, feeSatsPerNode, roundLifetime,
+		receivers, aspPublicKey, asset, feeSatsPerNode, roundLifetime, exitDelay,
 	)
 	if err != nil {
 		return
@@ -391,6 +421,7 @@ func createPartialCongestionTree(
 	asset string,
 	feeSatsPerNode uint64,
 	roundLifetime int64,
+	exitDelay int64,
 ) (root *node, err error) {
 	if len(receivers) == 0 {
 		return nil, fmt.Errorf("no receivers provided")
@@ -404,6 +435,7 @@ func createPartialCongestionTree(
 			asset:         asset,
 			feeSats:       feeSatsPerNode,
 			roundLifetime: roundLifetime,
+			exitDelay:     exitDelay,
 		}
 		nodes = append(nodes, leafNode)
 	}
--- a/server/internal/interface/grpc/handlers/arkservice.go
+++ b/server/internal/interface/grpc/handlers/arkservice.go
@@ -178,14 +178,16 @@ func (h *handler) ListVtxos(ctx context.Context, req *arkv1.ListVtxosRequest) (*
 	}, nil
 }

-func (h *handler) GetPubkey(ctx context.Context, req *arkv1.GetPubkeyRequest) (*arkv1.GetPubkeyResponse, error) {
-	pubkey, err := h.svc.GetPubkey(ctx)
+func (h *handler) GetInfo(ctx context.Context, req *arkv1.GetInfoRequest) (*arkv1.GetInfoResponse, error) {
+	pubkey, lifetime, delay, err := h.svc.GetInfo(ctx)
 	if err != nil {
 		return nil, err
 	}

-	return &arkv1.GetPubkeyResponse{
-		Pubkey: pubkey,
+	return &arkv1.GetInfoResponse{
+		Pubkey:    pubkey,
+		Lifetime:  lifetime,
+		ExitDelay: delay,
 	}, nil
 }