feature/1110 abstract connected wallet operations (#1166)

- **refactor: refactor DID module types and move to controller package**
- **refactor: move controller creation and resolution logic to keeper**
- **refactor: update imports to reflect controller package move**
- **refactor: update protobuf definitions for DID module**
- **docs: update proto README to reflect changes**
- **refactor: move hway to gateway, update node modules, and refactor
pkl generation**
- **build: update pkl-gen task to use new pkl file paths**
- **refactor: refactor DWN WASM build and deployment process**
- **refactor: refactor DID controller implementation to use
account-based storage**
- **refactor: move DID controller interface to base file and update
implementation**
- **chore: migrate to google protobuf**
- **feat: Add v0.52.0 Interfaces for Acc Abstraction**
- **refactor: replace public_key with public_key_hex in Assertion
message**
- **refactor: remove unused PubKey, JSONWebKey, and RawKey message types
and related code**

.github/workflows/publish-assets.yml

@@ -9,7 +9,7 @@ permissions:
   issues: write
 
 jobs:
-  buf_push:
+  buf_push_core:
     name: Publish to buf.build/onsonr/sonr
     runs-on: ubuntu-latest
     steps:
@@ -24,40 +24,60 @@ jobs:
           input: proto
           buf_token: ${{ secrets.BUF_TOKEN }}
 
-  #
+  buf_push_thirdparty:
-  # upload_configs:
+    name: Publish to buf.build/onsonr/thirdparty
-  #   runs-on: ubuntu-latest
-  #   name: Publish to configs.sonr.id
-  #   steps:
-  #     - name: checkout
-  #       uses: actions/checkout@v4
-  #     - name: Upload to R2
-  #       continue-on-error: true
-  #       uses: ryand56/r2-upload-action@latest
-  #       with:
-  #         r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
-  #         r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
-  #         r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-  #         r2-bucket: configs
-  #         source-dir: config
-  #         destination-dir: ./pkl
-  #
-
-  upload_pkl:
     runs-on: ubuntu-latest
-    name: Publish to pkl.sh
+    steps:
+      # Run `git checkout`
+      - uses: actions/checkout@v3
+      # Install the `buf` CLI
+      - uses: bufbuild/buf-setup-action@v1
+      # Push only the Input in `proto` to the BSR
+      - uses: bufbuild/buf-push-action@v1
+        continue-on-error: true
+        with:
+          input: third_party/proto
+          buf_token: ${{ secrets.BUF_TOKEN }}
+
+  upload_motr_dwn:
+    runs-on: ubuntu-latest
+    name: Publish to configs.sonr.id
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - name: Upload to R2
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+          check-latest: true
+
+      - name: Setup go-task / task / taskfile
+        uses: rnorton5432/setup-task@v1
+
+      - name: Build DWN WASM
+        run: task dwn:build
+
+      - name: Upload WASM to R2
+        continue-on-error: true
         uses: ryand56/r2-upload-action@latest
         with:
           r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
           r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
           r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          r2-bucket: pkljar
+          r2-bucket: nebula
-          source-dir: pkl
+          source-dir: ./build/app.wasm
-          destination-dir: .
+          destination-dir: wasm
+
+      - name: Upload SW JS to R2
+        continue-on-error: true
+        uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          r2-bucket: nebula
+          source-dir: ./pkg/motr/static/sw.js
+          destination-dir: js
 
   upload_nebula_cdn:
     runs-on: ubuntu-latest

.gitignore

@@ -71,7 +71,9 @@ deploy/**/data
 x/.DS_Store
 .aider*
 buildenv*
-nebula/node_modules
+node_modules
+cmd/gateway/node_modules
+pkg/nebula/node_modules
 
 mprocs.yaml
 build

Makefile

@@ -296,19 +296,14 @@ sh-testnet: mod-tidy
 
 .PHONY: templ-gen pkl-gen
 
-assets-gen:
-	@echo "(assets) Generating gateway cloudflare workers assets"
-	go run github.com/syumai/workers/cmd/workers-assets-gen -mode=go -o ./cmd/hway/build
-
 templ-gen:
 	@echo "(templ) Generating templ files"
 	templ generate
 
 pkl-gen:
 	@echo "(pkl) Building PKL"
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/DWN.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./third_party/pkl/src/sonr.configs.v1/DWN.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/ORM.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./third_party/pkl/src/sonr.models.v1/ORM.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/Txns.pkl
 
 ###############################################################################
 ###                                     help                                ###

Taskfile.yml

@@ -1,37 +1,41 @@
 version: "3"
-
 vars:
   ROOT_DIR:
     sh: pwd
 
 tasks:
+  hway:assets:
+    internal: true
+    cmds:
+      - go run github.com/syumai/workers/cmd/workers-assets-gen -mode=go -o ./cmd/gateway/build
+
   hway:build:
-    dir: cmd/hway
+    dir: cmd/gateway
     env:
       GOOS: js
       GOARCH: wasm
     cmds:
+      - task: hway:assets
       - go build -o build/app.wasm main.go
 
   hway:dev:
-    dir: cmd/hway
+    dir: cmd/gateway
     cmds:
       - task: nebula:build
       - bunx wrangler dev
 
   hway:deploy:
-    dir: cmd/hway
+    dir: cmd/gateway
     cmds:
       - task: nebula:build
       - bunx wrangler deploy
 
-  motr:build:
+  dwn:build:
-    dir: internal/dwn
     env:
       GOOS: js
       GOARCH: wasm
     cmds:
-      - go build -o app.wasm wasm/main.go
+      - go build -o build/app.wasm ./cmd/dwn/main.go
 
   nebula:build:
     dir: pkg/nebula
@@ -40,3 +44,43 @@ tasks:
       - bun run deps.mjs
       - bunx tailwindcss -i ./global/styles/globals.css -o ./assets/css/styles.css
       - templ generate
+
+  # ╭───────────────────────────────────────────────────────────╮
+  # │                  Registration Components                  │
+  # ╰───────────────────────────────────────────────────────────╯
+
+  buf:push:
+    cmds:
+      - task: buf:push:sonr
+      - task: buf:push:thirdparty
+
+  buf:deps:
+    cmds:
+      - task: buf:deps:sonr
+      - task: buf:deps:thirdparty
+
+  buf:deps:sonr:
+    internal: true
+    dir: proto
+    cmds:
+      - buf dep update
+
+  buf:deps:thirdparty:
+    internal: true
+    dir: third_party/proto
+    cmds:
+      - buf dep update
+
+  buf:push:sonr:
+    internal: true
+    dir: proto
+    cmds:
+      - buf build
+      - buf push
+
+  buf:push:thirdparty:
+    internal: true
+    dir: third_party/proto
+    cmds:
+      - buf build
+      - buf push

api/did/module/v1/module.pulsar.go

@@ -104,9 +104,9 @@ func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -120,9 +120,9 @@ func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -136,9 +136,9 @@ func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) pro
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -156,9 +156,9 @@ func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value proto
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -176,9 +176,9 @@ func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protore
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -189,9 +189,9 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.did.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: did.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.did.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message did.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -201,7 +201,7 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 func (x *fastReflection_Module) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in onsonr.sonr.did.module.v1.Module", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in did.module.v1.Module", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -414,29 +414,24 @@ var File_did_module_v1_module_proto protoreflect.FileDescriptor
 
 var file_did_module_v1_module_proto_rawDesc = []byte{
 	0x0a, 0x1a, 0x64, 0x69, 0x64, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x2f,
-	0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x6f, 0x6e,
+	0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x64, 0x69,
-	0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x6d, 0x6f,
+	0x64, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73,
-	0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f,
+	0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31,
-	0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64,
+	0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a,
-	0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2e, 0x0a, 0x06, 0x4d, 0x6f, 0x64,
+	0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x1e, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x18, 0x0a,
-	0x75, 0x6c, 0x65, 0x3a, 0x24, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x1e, 0x0a, 0x1c, 0x67, 0x69, 0x74,
+	0x16, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73,
+	0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x42, 0xa9, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e,
-	0x6f, 0x6e, 0x72, 0x2f, 0x78, 0x2f, 0x64, 0x69, 0x64, 0x42, 0xe8, 0x01, 0x0a, 0x1d, 0x63, 0x6f,
+	0x64, 0x69, 0x64, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d,
-	0x6d, 0x2e, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x64, 0x69,
+	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69,
-	0x64, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f,
-	0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68,
+	0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x64, 0x2f, 0x6d, 0x6f, 0x64,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f,
+	0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2,
-	0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69, 0x64, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
+	0x02, 0x03, 0x44, 0x4d, 0x58, 0xaa, 0x02, 0x0d, 0x44, 0x69, 0x64, 0x2e, 0x4d, 0x6f, 0x64, 0x75,
-	0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x04,
+	0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x44, 0x69, 0x64, 0x5c, 0x4d, 0x6f, 0x64, 0x75,
-	0x4f, 0x53, 0x44, 0x4d, 0xaa, 0x02, 0x19, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x53, 0x6f,
+	0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x44, 0x69, 0x64, 0x5c, 0x4d, 0x6f, 0x64, 0x75,
-	0x6e, 0x72, 0x2e, 0x44, 0x69, 0x64, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31,
+	0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0xca, 0x02, 0x19, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x44,
+	0x61, 0xea, 0x02, 0x0f, 0x44, 0x69, 0x64, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a,
-	0x69, 0x64, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x25, 0x4f,
+	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x44, 0x69, 0x64, 0x5c, 0x4d,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1d, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x53,
-	0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x44, 0x69, 0x64, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -453,7 +448,7 @@ func file_did_module_v1_module_proto_rawDescGZIP() []byte {
 
 var file_did_module_v1_module_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_did_module_v1_module_proto_goTypes = []interface{}{
-	(*Module)(nil), // 0: onsonr.sonr.did.module.v1.Module
+	(*Module)(nil), // 0: did.module.v1.Module
 }
 var file_did_module_v1_module_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type

api/did/v1/query_grpc.pb.go

@@ -21,7 +21,6 @@ const _ = grpc.SupportPackageIsVersion9
 const (
 	Query_Params_FullMethodName  = "/did.v1.Query/Params"
 	Query_Resolve_FullMethodName = "/did.v1.Query/Resolve"
-	Query_Sign_FullMethodName    = "/did.v1.Query/Sign"
 	Query_Verify_FullMethodName  = "/did.v1.Query/Verify"
 )
 
@@ -35,8 +34,6 @@ type QueryClient interface {
 	Params(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error)
 	// Resolve queries the DID document by its id.
 	Resolve(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResolveResponse, error)
-	// Sign signs a message with the DID document
-	Sign(ctx context.Context, in *QuerySignRequest, opts ...grpc.CallOption) (*QuerySignResponse, error)
 	// Verify verifies a message with the DID document
 	Verify(ctx context.Context, in *QueryVerifyRequest, opts ...grpc.CallOption) (*QueryVerifyResponse, error)
 }
@@ -69,16 +66,6 @@ func (c *queryClient) Resolve(ctx context.Context, in *QueryRequest, opts ...grp
 	return out, nil
 }
 
-func (c *queryClient) Sign(ctx context.Context, in *QuerySignRequest, opts ...grpc.CallOption) (*QuerySignResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(QuerySignResponse)
-	err := c.cc.Invoke(ctx, Query_Sign_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *queryClient) Verify(ctx context.Context, in *QueryVerifyRequest, opts ...grpc.CallOption) (*QueryVerifyResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(QueryVerifyResponse)
@@ -99,8 +86,6 @@ type QueryServer interface {
 	Params(context.Context, *QueryRequest) (*QueryParamsResponse, error)
 	// Resolve queries the DID document by its id.
 	Resolve(context.Context, *QueryRequest) (*QueryResolveResponse, error)
-	// Sign signs a message with the DID document
-	Sign(context.Context, *QuerySignRequest) (*QuerySignResponse, error)
 	// Verify verifies a message with the DID document
 	Verify(context.Context, *QueryVerifyRequest) (*QueryVerifyResponse, error)
 	mustEmbedUnimplementedQueryServer()
@@ -119,9 +104,6 @@ func (UnimplementedQueryServer) Params(context.Context, *QueryRequest) (*QueryPa
 func (UnimplementedQueryServer) Resolve(context.Context, *QueryRequest) (*QueryResolveResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Resolve not implemented")
 }
-func (UnimplementedQueryServer) Sign(context.Context, *QuerySignRequest) (*QuerySignResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Sign not implemented")
-}
 func (UnimplementedQueryServer) Verify(context.Context, *QueryVerifyRequest) (*QueryVerifyResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Verify not implemented")
 }
@@ -182,24 +164,6 @@ func _Query_Resolve_Handler(srv interface{}, ctx context.Context, dec func(inter
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Query_Sign_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(QuerySignRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(QueryServer).Sign(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Query_Sign_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(QueryServer).Sign(ctx, req.(*QuerySignRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Query_Verify_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(QueryVerifyRequest)
 	if err := dec(in); err != nil {
@@ -233,10 +197,6 @@ var Query_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "Resolve",
 			Handler:    _Query_Resolve_Handler,
 		},
-		{
-			MethodName: "Sign",
-			Handler:    _Query_Sign_Handler,
-		},
 		{
 			MethodName: "Verify",
 			Handler:    _Query_Verify_Handler,

api/did/v1/state.cosmos_orm.go

@@ -323,6 +323,173 @@ func NewAuthenticationTable(db ormtable.Schema) (AuthenticationTable, error) {
 	return authenticationTable{table}, nil
 }
 
+type BiscuitTable interface {
+	Insert(ctx context.Context, biscuit *Biscuit) error
+	InsertReturningId(ctx context.Context, biscuit *Biscuit) (uint64, error)
+	LastInsertedSequence(ctx context.Context) (uint64, error)
+	Update(ctx context.Context, biscuit *Biscuit) error
+	Save(ctx context.Context, biscuit *Biscuit) error
+	Delete(ctx context.Context, biscuit *Biscuit) error
+	Has(ctx context.Context, id uint64) (found bool, err error)
+	// Get returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
+	Get(ctx context.Context, id uint64) (*Biscuit, error)
+	HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error)
+	// GetBySubjectOrigin returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
+	GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Biscuit, error)
+	List(ctx context.Context, prefixKey BiscuitIndexKey, opts ...ormlist.Option) (BiscuitIterator, error)
+	ListRange(ctx context.Context, from, to BiscuitIndexKey, opts ...ormlist.Option) (BiscuitIterator, error)
+	DeleteBy(ctx context.Context, prefixKey BiscuitIndexKey) error
+	DeleteRange(ctx context.Context, from, to BiscuitIndexKey) error
+
+	doNotImplement()
+}
+
+type BiscuitIterator struct {
+	ormtable.Iterator
+}
+
+func (i BiscuitIterator) Value() (*Biscuit, error) {
+	var biscuit Biscuit
+	err := i.UnmarshalMessage(&biscuit)
+	return &biscuit, err
+}
+
+type BiscuitIndexKey interface {
+	id() uint32
+	values() []interface{}
+	biscuitIndexKey()
+}
+
+// primary key starting index..
+type BiscuitPrimaryKey = BiscuitIdIndexKey
+
+type BiscuitIdIndexKey struct {
+	vs []interface{}
+}
+
+func (x BiscuitIdIndexKey) id() uint32            { return 0 }
+func (x BiscuitIdIndexKey) values() []interface{} { return x.vs }
+func (x BiscuitIdIndexKey) biscuitIndexKey()      {}
+
+func (this BiscuitIdIndexKey) WithId(id uint64) BiscuitIdIndexKey {
+	this.vs = []interface{}{id}
+	return this
+}
+
+type BiscuitSubjectOriginIndexKey struct {
+	vs []interface{}
+}
+
+func (x BiscuitSubjectOriginIndexKey) id() uint32            { return 1 }
+func (x BiscuitSubjectOriginIndexKey) values() []interface{} { return x.vs }
+func (x BiscuitSubjectOriginIndexKey) biscuitIndexKey()      {}
+
+func (this BiscuitSubjectOriginIndexKey) WithSubject(subject string) BiscuitSubjectOriginIndexKey {
+	this.vs = []interface{}{subject}
+	return this
+}
+
+func (this BiscuitSubjectOriginIndexKey) WithSubjectOrigin(subject string, origin string) BiscuitSubjectOriginIndexKey {
+	this.vs = []interface{}{subject, origin}
+	return this
+}
+
+type biscuitTable struct {
+	table ormtable.AutoIncrementTable
+}
+
+func (this biscuitTable) Insert(ctx context.Context, biscuit *Biscuit) error {
+	return this.table.Insert(ctx, biscuit)
+}
+
+func (this biscuitTable) Update(ctx context.Context, biscuit *Biscuit) error {
+	return this.table.Update(ctx, biscuit)
+}
+
+func (this biscuitTable) Save(ctx context.Context, biscuit *Biscuit) error {
+	return this.table.Save(ctx, biscuit)
+}
+
+func (this biscuitTable) Delete(ctx context.Context, biscuit *Biscuit) error {
+	return this.table.Delete(ctx, biscuit)
+}
+
+func (this biscuitTable) InsertReturningId(ctx context.Context, biscuit *Biscuit) (uint64, error) {
+	return this.table.InsertReturningPKey(ctx, biscuit)
+}
+
+func (this biscuitTable) LastInsertedSequence(ctx context.Context) (uint64, error) {
+	return this.table.LastInsertedSequence(ctx)
+}
+
+func (this biscuitTable) Has(ctx context.Context, id uint64) (found bool, err error) {
+	return this.table.PrimaryKey().Has(ctx, id)
+}
+
+func (this biscuitTable) Get(ctx context.Context, id uint64) (*Biscuit, error) {
+	var biscuit Biscuit
+	found, err := this.table.PrimaryKey().Get(ctx, &biscuit, id)
+	if err != nil {
+		return nil, err
+	}
+	if !found {
+		return nil, ormerrors.NotFound
+	}
+	return &biscuit, nil
+}
+
+func (this biscuitTable) HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error) {
+	return this.table.GetIndexByID(1).(ormtable.UniqueIndex).Has(ctx,
+		subject,
+		origin,
+	)
+}
+
+func (this biscuitTable) GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Biscuit, error) {
+	var biscuit Biscuit
+	found, err := this.table.GetIndexByID(1).(ormtable.UniqueIndex).Get(ctx, &biscuit,
+		subject,
+		origin,
+	)
+	if err != nil {
+		return nil, err
+	}
+	if !found {
+		return nil, ormerrors.NotFound
+	}
+	return &biscuit, nil
+}
+
+func (this biscuitTable) List(ctx context.Context, prefixKey BiscuitIndexKey, opts ...ormlist.Option) (BiscuitIterator, error) {
+	it, err := this.table.GetIndexByID(prefixKey.id()).List(ctx, prefixKey.values(), opts...)
+	return BiscuitIterator{it}, err
+}
+
+func (this biscuitTable) ListRange(ctx context.Context, from, to BiscuitIndexKey, opts ...ormlist.Option) (BiscuitIterator, error) {
+	it, err := this.table.GetIndexByID(from.id()).ListRange(ctx, from.values(), to.values(), opts...)
+	return BiscuitIterator{it}, err
+}
+
+func (this biscuitTable) DeleteBy(ctx context.Context, prefixKey BiscuitIndexKey) error {
+	return this.table.GetIndexByID(prefixKey.id()).DeleteBy(ctx, prefixKey.values()...)
+}
+
+func (this biscuitTable) DeleteRange(ctx context.Context, from, to BiscuitIndexKey) error {
+	return this.table.GetIndexByID(from.id()).DeleteRange(ctx, from.values(), to.values())
+}
+
+func (this biscuitTable) doNotImplement() {}
+
+var _ BiscuitTable = biscuitTable{}
+
+func NewBiscuitTable(db ormtable.Schema) (BiscuitTable, error) {
+	table := db.GetTable(&Biscuit{})
+	if table == nil {
+		return nil, ormerrors.TableNotFound.Wrap(string((&Biscuit{}).ProtoReflect().Descriptor().FullName()))
+	}
+	return biscuitTable{table.(ormtable.AutoIncrementTable)}, nil
+}
+
 type ControllerTable interface {
 	Insert(ctx context.Context, controller *Controller) error
 	InsertReturningNumber(ctx context.Context, controller *Controller) (uint64, error)
@@ -591,340 +758,6 @@ func NewControllerTable(db ormtable.Schema) (ControllerTable, error) {
 	return controllerTable{table.(ormtable.AutoIncrementTable)}, nil
 }
 
-type GrantTable interface {
-	Insert(ctx context.Context, grant *Grant) error
-	InsertReturningId(ctx context.Context, grant *Grant) (uint64, error)
-	LastInsertedSequence(ctx context.Context) (uint64, error)
-	Update(ctx context.Context, grant *Grant) error
-	Save(ctx context.Context, grant *Grant) error
-	Delete(ctx context.Context, grant *Grant) error
-	Has(ctx context.Context, id uint64) (found bool, err error)
-	// Get returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
-	Get(ctx context.Context, id uint64) (*Grant, error)
-	HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error)
-	// GetBySubjectOrigin returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
-	GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Grant, error)
-	List(ctx context.Context, prefixKey GrantIndexKey, opts ...ormlist.Option) (GrantIterator, error)
-	ListRange(ctx context.Context, from, to GrantIndexKey, opts ...ormlist.Option) (GrantIterator, error)
-	DeleteBy(ctx context.Context, prefixKey GrantIndexKey) error
-	DeleteRange(ctx context.Context, from, to GrantIndexKey) error
-
-	doNotImplement()
-}
-
-type GrantIterator struct {
-	ormtable.Iterator
-}
-
-func (i GrantIterator) Value() (*Grant, error) {
-	var grant Grant
-	err := i.UnmarshalMessage(&grant)
-	return &grant, err
-}
-
-type GrantIndexKey interface {
-	id() uint32
-	values() []interface{}
-	grantIndexKey()
-}
-
-// primary key starting index..
-type GrantPrimaryKey = GrantIdIndexKey
-
-type GrantIdIndexKey struct {
-	vs []interface{}
-}
-
-func (x GrantIdIndexKey) id() uint32            { return 0 }
-func (x GrantIdIndexKey) values() []interface{} { return x.vs }
-func (x GrantIdIndexKey) grantIndexKey()        {}
-
-func (this GrantIdIndexKey) WithId(id uint64) GrantIdIndexKey {
-	this.vs = []interface{}{id}
-	return this
-}
-
-type GrantSubjectOriginIndexKey struct {
-	vs []interface{}
-}
-
-func (x GrantSubjectOriginIndexKey) id() uint32            { return 1 }
-func (x GrantSubjectOriginIndexKey) values() []interface{} { return x.vs }
-func (x GrantSubjectOriginIndexKey) grantIndexKey()        {}
-
-func (this GrantSubjectOriginIndexKey) WithSubject(subject string) GrantSubjectOriginIndexKey {
-	this.vs = []interface{}{subject}
-	return this
-}
-
-func (this GrantSubjectOriginIndexKey) WithSubjectOrigin(subject string, origin string) GrantSubjectOriginIndexKey {
-	this.vs = []interface{}{subject, origin}
-	return this
-}
-
-type grantTable struct {
-	table ormtable.AutoIncrementTable
-}
-
-func (this grantTable) Insert(ctx context.Context, grant *Grant) error {
-	return this.table.Insert(ctx, grant)
-}
-
-func (this grantTable) Update(ctx context.Context, grant *Grant) error {
-	return this.table.Update(ctx, grant)
-}
-
-func (this grantTable) Save(ctx context.Context, grant *Grant) error {
-	return this.table.Save(ctx, grant)
-}
-
-func (this grantTable) Delete(ctx context.Context, grant *Grant) error {
-	return this.table.Delete(ctx, grant)
-}
-
-func (this grantTable) InsertReturningId(ctx context.Context, grant *Grant) (uint64, error) {
-	return this.table.InsertReturningPKey(ctx, grant)
-}
-
-func (this grantTable) LastInsertedSequence(ctx context.Context) (uint64, error) {
-	return this.table.LastInsertedSequence(ctx)
-}
-
-func (this grantTable) Has(ctx context.Context, id uint64) (found bool, err error) {
-	return this.table.PrimaryKey().Has(ctx, id)
-}
-
-func (this grantTable) Get(ctx context.Context, id uint64) (*Grant, error) {
-	var grant Grant
-	found, err := this.table.PrimaryKey().Get(ctx, &grant, id)
-	if err != nil {
-		return nil, err
-	}
-	if !found {
-		return nil, ormerrors.NotFound
-	}
-	return &grant, nil
-}
-
-func (this grantTable) HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error) {
-	return this.table.GetIndexByID(1).(ormtable.UniqueIndex).Has(ctx,
-		subject,
-		origin,
-	)
-}
-
-func (this grantTable) GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Grant, error) {
-	var grant Grant
-	found, err := this.table.GetIndexByID(1).(ormtable.UniqueIndex).Get(ctx, &grant,
-		subject,
-		origin,
-	)
-	if err != nil {
-		return nil, err
-	}
-	if !found {
-		return nil, ormerrors.NotFound
-	}
-	return &grant, nil
-}
-
-func (this grantTable) List(ctx context.Context, prefixKey GrantIndexKey, opts ...ormlist.Option) (GrantIterator, error) {
-	it, err := this.table.GetIndexByID(prefixKey.id()).List(ctx, prefixKey.values(), opts...)
-	return GrantIterator{it}, err
-}
-
-func (this grantTable) ListRange(ctx context.Context, from, to GrantIndexKey, opts ...ormlist.Option) (GrantIterator, error) {
-	it, err := this.table.GetIndexByID(from.id()).ListRange(ctx, from.values(), to.values(), opts...)
-	return GrantIterator{it}, err
-}
-
-func (this grantTable) DeleteBy(ctx context.Context, prefixKey GrantIndexKey) error {
-	return this.table.GetIndexByID(prefixKey.id()).DeleteBy(ctx, prefixKey.values()...)
-}
-
-func (this grantTable) DeleteRange(ctx context.Context, from, to GrantIndexKey) error {
-	return this.table.GetIndexByID(from.id()).DeleteRange(ctx, from.values(), to.values())
-}
-
-func (this grantTable) doNotImplement() {}
-
-var _ GrantTable = grantTable{}
-
-func NewGrantTable(db ormtable.Schema) (GrantTable, error) {
-	table := db.GetTable(&Grant{})
-	if table == nil {
-		return nil, ormerrors.TableNotFound.Wrap(string((&Grant{}).ProtoReflect().Descriptor().FullName()))
-	}
-	return grantTable{table.(ormtable.AutoIncrementTable)}, nil
-}
-
-type MacaroonTable interface {
-	Insert(ctx context.Context, macaroon *Macaroon) error
-	InsertReturningId(ctx context.Context, macaroon *Macaroon) (uint64, error)
-	LastInsertedSequence(ctx context.Context) (uint64, error)
-	Update(ctx context.Context, macaroon *Macaroon) error
-	Save(ctx context.Context, macaroon *Macaroon) error
-	Delete(ctx context.Context, macaroon *Macaroon) error
-	Has(ctx context.Context, id uint64) (found bool, err error)
-	// Get returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
-	Get(ctx context.Context, id uint64) (*Macaroon, error)
-	HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error)
-	// GetBySubjectOrigin returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found.
-	GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Macaroon, error)
-	List(ctx context.Context, prefixKey MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error)
-	ListRange(ctx context.Context, from, to MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error)
-	DeleteBy(ctx context.Context, prefixKey MacaroonIndexKey) error
-	DeleteRange(ctx context.Context, from, to MacaroonIndexKey) error
-
-	doNotImplement()
-}
-
-type MacaroonIterator struct {
-	ormtable.Iterator
-}
-
-func (i MacaroonIterator) Value() (*Macaroon, error) {
-	var macaroon Macaroon
-	err := i.UnmarshalMessage(&macaroon)
-	return &macaroon, err
-}
-
-type MacaroonIndexKey interface {
-	id() uint32
-	values() []interface{}
-	macaroonIndexKey()
-}
-
-// primary key starting index..
-type MacaroonPrimaryKey = MacaroonIdIndexKey
-
-type MacaroonIdIndexKey struct {
-	vs []interface{}
-}
-
-func (x MacaroonIdIndexKey) id() uint32            { return 0 }
-func (x MacaroonIdIndexKey) values() []interface{} { return x.vs }
-func (x MacaroonIdIndexKey) macaroonIndexKey()     {}
-
-func (this MacaroonIdIndexKey) WithId(id uint64) MacaroonIdIndexKey {
-	this.vs = []interface{}{id}
-	return this
-}
-
-type MacaroonSubjectOriginIndexKey struct {
-	vs []interface{}
-}
-
-func (x MacaroonSubjectOriginIndexKey) id() uint32            { return 1 }
-func (x MacaroonSubjectOriginIndexKey) values() []interface{} { return x.vs }
-func (x MacaroonSubjectOriginIndexKey) macaroonIndexKey()     {}
-
-func (this MacaroonSubjectOriginIndexKey) WithSubject(subject string) MacaroonSubjectOriginIndexKey {
-	this.vs = []interface{}{subject}
-	return this
-}
-
-func (this MacaroonSubjectOriginIndexKey) WithSubjectOrigin(subject string, origin string) MacaroonSubjectOriginIndexKey {
-	this.vs = []interface{}{subject, origin}
-	return this
-}
-
-type macaroonTable struct {
-	table ormtable.AutoIncrementTable
-}
-
-func (this macaroonTable) Insert(ctx context.Context, macaroon *Macaroon) error {
-	return this.table.Insert(ctx, macaroon)
-}
-
-func (this macaroonTable) Update(ctx context.Context, macaroon *Macaroon) error {
-	return this.table.Update(ctx, macaroon)
-}
-
-func (this macaroonTable) Save(ctx context.Context, macaroon *Macaroon) error {
-	return this.table.Save(ctx, macaroon)
-}
-
-func (this macaroonTable) Delete(ctx context.Context, macaroon *Macaroon) error {
-	return this.table.Delete(ctx, macaroon)
-}
-
-func (this macaroonTable) InsertReturningId(ctx context.Context, macaroon *Macaroon) (uint64, error) {
-	return this.table.InsertReturningPKey(ctx, macaroon)
-}
-
-func (this macaroonTable) LastInsertedSequence(ctx context.Context) (uint64, error) {
-	return this.table.LastInsertedSequence(ctx)
-}
-
-func (this macaroonTable) Has(ctx context.Context, id uint64) (found bool, err error) {
-	return this.table.PrimaryKey().Has(ctx, id)
-}
-
-func (this macaroonTable) Get(ctx context.Context, id uint64) (*Macaroon, error) {
-	var macaroon Macaroon
-	found, err := this.table.PrimaryKey().Get(ctx, &macaroon, id)
-	if err != nil {
-		return nil, err
-	}
-	if !found {
-		return nil, ormerrors.NotFound
-	}
-	return &macaroon, nil
-}
-
-func (this macaroonTable) HasBySubjectOrigin(ctx context.Context, subject string, origin string) (found bool, err error) {
-	return this.table.GetIndexByID(1).(ormtable.UniqueIndex).Has(ctx,
-		subject,
-		origin,
-	)
-}
-
-func (this macaroonTable) GetBySubjectOrigin(ctx context.Context, subject string, origin string) (*Macaroon, error) {
-	var macaroon Macaroon
-	found, err := this.table.GetIndexByID(1).(ormtable.UniqueIndex).Get(ctx, &macaroon,
-		subject,
-		origin,
-	)
-	if err != nil {
-		return nil, err
-	}
-	if !found {
-		return nil, ormerrors.NotFound
-	}
-	return &macaroon, nil
-}
-
-func (this macaroonTable) List(ctx context.Context, prefixKey MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error) {
-	it, err := this.table.GetIndexByID(prefixKey.id()).List(ctx, prefixKey.values(), opts...)
-	return MacaroonIterator{it}, err
-}
-
-func (this macaroonTable) ListRange(ctx context.Context, from, to MacaroonIndexKey, opts ...ormlist.Option) (MacaroonIterator, error) {
-	it, err := this.table.GetIndexByID(from.id()).ListRange(ctx, from.values(), to.values(), opts...)
-	return MacaroonIterator{it}, err
-}
-
-func (this macaroonTable) DeleteBy(ctx context.Context, prefixKey MacaroonIndexKey) error {
-	return this.table.GetIndexByID(prefixKey.id()).DeleteBy(ctx, prefixKey.values()...)
-}
-
-func (this macaroonTable) DeleteRange(ctx context.Context, from, to MacaroonIndexKey) error {
-	return this.table.GetIndexByID(from.id()).DeleteRange(ctx, from.values(), to.values())
-}
-
-func (this macaroonTable) doNotImplement() {}
-
-var _ MacaroonTable = macaroonTable{}
-
-func NewMacaroonTable(db ormtable.Schema) (MacaroonTable, error) {
-	table := db.GetTable(&Macaroon{})
-	if table == nil {
-		return nil, ormerrors.TableNotFound.Wrap(string((&Macaroon{}).ProtoReflect().Descriptor().FullName()))
-	}
-	return macaroonTable{table.(ormtable.AutoIncrementTable)}, nil
-}
-
 type VerificationTable interface {
 	Insert(ctx context.Context, verification *Verification) error
 	Update(ctx context.Context, verification *Verification) error
@@ -1185,9 +1018,8 @@ func NewVerificationTable(db ormtable.Schema) (VerificationTable, error) {
 type StateStore interface {
 	AssertionTable() AssertionTable
 	AuthenticationTable() AuthenticationTable
+	BiscuitTable() BiscuitTable
 	ControllerTable() ControllerTable
-	GrantTable() GrantTable
-	MacaroonTable() MacaroonTable
 	VerificationTable() VerificationTable
 
 	doNotImplement()
@@ -1196,9 +1028,8 @@ type StateStore interface {
 type stateStore struct {
 	assertion      AssertionTable
 	authentication AuthenticationTable
+	biscuit        BiscuitTable
 	controller     ControllerTable
-	grant          GrantTable
-	macaroon       MacaroonTable
 	verification   VerificationTable
 }
 
@@ -1210,18 +1041,14 @@ func (x stateStore) AuthenticationTable() AuthenticationTable {
 	return x.authentication
 }
 
+func (x stateStore) BiscuitTable() BiscuitTable {
+	return x.biscuit
+}
+
 func (x stateStore) ControllerTable() ControllerTable {
 	return x.controller
 }
 
-func (x stateStore) GrantTable() GrantTable {
-	return x.grant
-}
-
-func (x stateStore) MacaroonTable() MacaroonTable {
-	return x.macaroon
-}
-
 func (x stateStore) VerificationTable() VerificationTable {
 	return x.verification
 }
@@ -1241,21 +1068,16 @@ func NewStateStore(db ormtable.Schema) (StateStore, error) {
 		return nil, err
 	}
 
+	biscuitTable, err := NewBiscuitTable(db)
+	if err != nil {
+		return nil, err
+	}
+
 	controllerTable, err := NewControllerTable(db)
 	if err != nil {
 		return nil, err
 	}
 
-	grantTable, err := NewGrantTable(db)
-	if err != nil {
-		return nil, err
-	}
-
-	macaroonTable, err := NewMacaroonTable(db)
-	if err != nil {
-		return nil, err
-	}
-
 	verificationTable, err := NewVerificationTable(db)
 	if err != nil {
 		return nil, err
@@ -1264,9 +1086,8 @@ func NewStateStore(db ormtable.Schema) (StateStore, error) {
 	return stateStore{
 		assertionTable,
 		authenticationTable,
+		biscuitTable,
 		controllerTable,
-		grantTable,
-		macaroonTable,
 		verificationTable,
 	}, nil
 }

api/did/v1/tx.pulsar.go

@@ -7128,148 +7128,149 @@ var file_did_v1_tx_proto_rawDesc = []byte{
 	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, 0x14, 0x64,
 	0x69, 0x64, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,
+	0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x64, 0x69, 0x64, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x61,
-	0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe6, 0x01, 0x0a, 0x15, 0x4d, 0x73,
+	0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72,
-	0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74,
+	0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe6,
-	0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65,
+	0x01, 0x0a, 0x15, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73,
+	0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74,
-	0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x18, 0x0a,
-	0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x73, 0x73, 0x65,
-	0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x61, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x63, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61,
-	0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c,
-	0x65, 0x72, 0x22, 0x4b, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74,
-	0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a,
-	0x03, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22,
-	0xbc, 0x01, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x18,
-	0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x73, 0x73, 0x65,
-	0x72, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x73, 0x73,
-	0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f,
-	0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0f, 0x82,
-	0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x46,
-	0x0a, 0x18, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0xfd, 0x01, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x45, 0x78,
-	0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d,
-	0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65,
-	0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67,
-	0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f,
-	0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72,
-	0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x49, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65,
-	0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x68,
-	0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x78, 0x48, 0x61, 0x73,
-	0x68, 0x22, 0xab, 0x01, 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41,
-	0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74,
 	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4,
 	0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
 	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c,
-	0x65, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20,
-	0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x73, 0x73, 0x65, 0x72,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09,
-	0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72,
+	0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x72,
-	0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0f,
+	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22,
+	0x0c, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x49, 0x64, 0x12,
-	0x48, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65,
+	0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
-	0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a,
+	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f,
-	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+	0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64, 0x18, 0x02,
+	0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x4b, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x4c, 0x69,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0xba, 0x01, 0x0a, 0x17, 0x4d, 0x73,
+	0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65,
-	0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63,
+	0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72,
+	0x03, 0x64, 0x69, 0x64, 0x22, 0xbc, 0x01, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b,
-	0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12,
+	0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6e,
-	0x2d, 0x0a, 0x12, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2,
-	0x6e, 0x5f, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x75, 0x74,
+	0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x64, 0x12, 0x25,
+	0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x6c, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74,
+	0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x4d, 0x0a, 0x1f, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c,
+	0x52, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x6d,
+	0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x6c, 0x65, 0x72, 0x22, 0x46, 0x0a, 0x18, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73,
+	0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0xfd, 0x01, 0x0a, 0x0c,
+	0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x12, 0x38, 0x0a, 0x0a,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76,
+	0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x2e, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f,
+	0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
+	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x3b, 0x0a,
+	0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x49, 0x0a, 0x14, 0x4d,
+	0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x17, 0x0a,
+	0x07, 0x74, 0x78, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x74, 0x78, 0x48, 0x61, 0x73, 0x68, 0x22, 0xab, 0x01, 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x55, 0x6e,
+	0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x73, 0x73, 0x65, 0x72,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e,
+	0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x6c, 0x65, 0x72, 0x22, 0x48, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e,
+	0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03,
+	0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0xba,
+	0x01, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68,
+	0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18,
+	0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
+	0x6c, 0x6c, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x12, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x11, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x44, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x63, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x61, 0x63,
+	0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0f, 0x82, 0xe7, 0xb0, 0x2a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x4d, 0x0a, 0x1f, 0x4d,
+	0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0x9d, 0x01, 0x0a, 0x0f, 0x4d,
+	0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36,
+	0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, 0x74,
+	0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x2c, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0e, 0x82, 0xe7, 0xb0, 0x2a,
+	0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73,
+	0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xf5, 0x03, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x3f, 0x0a,
+	0x09, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x12, 0x14, 0x2e, 0x64, 0x69, 0x64,
+	0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78,
+	0x1a, 0x1c, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65,
+	0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b,
+	0x0a, 0x0d, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x18, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b,
+	0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x20, 0x2e, 0x64, 0x69, 0x64, 0x2e,
+	0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a, 0x12, 0x4c,
 	0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63,
+	0x6e, 0x12, 0x1d, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69,
-	0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63,
+	0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x1a, 0x25, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e,
-	0x52, 0x03, 0x64, 0x69, 0x64, 0x22, 0x9d, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74,
-	0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4,
-	0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74,
-	0x79, 0x12, 0x2c, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12,
-	0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x0e, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68,
-	0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x32, 0xf5, 0x03, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x3f, 0x0a, 0x09, 0x45, 0x78, 0x65, 0x63,
-	0x75, 0x74, 0x65, 0x54, 0x78, 0x12, 0x14, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
-	0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54, 0x78, 0x1a, 0x1c, 0x2e, 0x64, 0x69,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x54,
-	0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x0d, 0x4c, 0x69, 0x6e,
-	0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x2e, 0x64, 0x69, 0x64,
-	0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72,
-	0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x20, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73,
-	0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75,
-	0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x64,
-	0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74,
-	0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x25, 0x2e, 0x64, 0x69,
-	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68,
-	0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x51, 0x0a, 0x0f, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65,
-	0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
-	0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f,
-	0x6e, 0x1a, 0x22, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x6e,
-	0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x14, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41,
-	0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x2e,
-	0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b,
-	0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x27,
-	0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e,
 	0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0f, 0x55, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x17, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31,
+	0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x2e, 0x64, 0x69, 0x64,
-	0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
+	0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73,
-	0x1a, 0x1f, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64,
+	0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x22, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e,
-	0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x4d, 0x73, 0x67, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69,
-	0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0x77, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x14, 0x55, 0x6e,
-	0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e,
+	0x6f, 0x6e, 0x12, 0x1f, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55,
-	0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74,
-	0x64, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x64, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x44, 0x58, 0x58,
+	0x69, 0x6f, 0x6e, 0x1a, 0x27, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67,
-	0xaa, 0x02, 0x06, 0x44, 0x69, 0x64, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x06, 0x44, 0x69, 0x64, 0x5c,
+	0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61,
-	0x56, 0x31, 0xe2, 0x02, 0x12, 0x44, 0x69, 0x64, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0c,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x44, 0x69, 0x64, 0x3a, 0x3a, 0x56,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x17, 0x2e, 0x64,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50,
+	0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x1f, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
+	0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0x77, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x69, 0x64, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x64, 0x69, 0x64, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x64, 0x76, 0x31, 0xa2,
+	0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x44, 0x69, 0x64, 0x2e, 0x56, 0x31, 0xca, 0x02,
+	0x06, 0x44, 0x69, 0x64, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x12, 0x44, 0x69, 0x64, 0x5c, 0x56, 0x31,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x44,
+	0x69, 0x64, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -7329,6 +7330,7 @@ func file_did_v1_tx_proto_init() {
 		return
 	}
 	file_did_v1_genesis_proto_init()
+	file_did_v1_params_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_did_v1_tx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgLinkAuthentication); i {

api/service/module/v1/module.pulsar.go

@@ -104,9 +104,9 @@ func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -120,9 +120,9 @@ func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -136,9 +136,9 @@ func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) pro
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -156,9 +156,9 @@ func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value proto
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -176,9 +176,9 @@ func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protore
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -189,9 +189,9 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.service.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.service.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message service.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -201,7 +201,7 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 func (x *fastReflection_Module) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in onsonr.sonr.service.module.v1.Module", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in service.module.v1.Module", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -415,30 +415,25 @@ var File_service_module_v1_module_proto protoreflect.FileDescriptor
 var file_service_module_v1_module_proto_rawDesc = []byte{
 	0x0a, 0x1e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
 	0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x1d, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x65,
+	0x12, 0x11, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a,
+	0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f,
-	0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c,
+	0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e,
-	0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a,
-	0x6f, 0x22, 0x32, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x28, 0xba, 0xc0, 0x96,
+	0x1e, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x18, 0x0a, 0x16, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0xda, 0x01, 0x22, 0x0a, 0x20, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x42,
-	0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x78, 0x2f, 0x73, 0x65,
+	0xc1, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x80, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x6e,
+	0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, 0x6c,
-	0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x65, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72,
-	0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6d, 0x6f, 0x64,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f,
+	0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2,
-	0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6d,
+	0x02, 0x03, 0x53, 0x4d, 0x58, 0xaa, 0x02, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76,
+	0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x53, 0x65, 0x72, 0x76,
-	0x31, 0xa2, 0x02, 0x04, 0x4f, 0x53, 0x53, 0x4d, 0xaa, 0x02, 0x1d, 0x4f, 0x6e, 0x73, 0x6f, 0x6e,
+	0x69, 0x63, 0x65, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d,
-	0x72, 0x2e, 0x53, 0x6f, 0x6e, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1d, 0x4f, 0x6e, 0x73, 0x6f, 0x6e,
+	0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13,
-	0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x4d,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x29, 0x4f, 0x6e, 0x73, 0x6f, 0x6e,
+	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x4d,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x21, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x53,
-	0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x4d, 0x6f,
-	0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -455,7 +450,7 @@ func file_service_module_v1_module_proto_rawDescGZIP() []byte {
 
 var file_service_module_v1_module_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_service_module_v1_module_proto_goTypes = []interface{}{
-	(*Module)(nil), // 0: onsonr.sonr.service.module.v1.Module
+	(*Module)(nil), // 0: service.module.v1.Module
 }
 var file_service_module_v1_module_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type

api/service/v1/state.pulsar.go

@@ -177,8 +177,8 @@ func (x *fastReflection_Metadata) Range(f func(protoreflect.FieldDescriptor, pro
 			return
 		}
 	}
-	if x.Icon != nil {
+	if x.Icon != "" {
-		value := protoreflect.ValueOfMessage(x.Icon.ProtoReflect())
+		value := protoreflect.ValueOfString(x.Icon)
 		if !f(fd_Metadata_icon, value) {
 			return
 		}
@@ -215,7 +215,7 @@ func (x *fastReflection_Metadata) Has(fd protoreflect.FieldDescriptor) bool {
 	case "service.v1.Metadata.category":
 		return x.Category != ""
 	case "service.v1.Metadata.icon":
-		return x.Icon != nil
+		return x.Icon != ""
 	case "service.v1.Metadata.tags":
 		return len(x.Tags) != 0
 	default:
@@ -245,7 +245,7 @@ func (x *fastReflection_Metadata) Clear(fd protoreflect.FieldDescriptor) {
 	case "service.v1.Metadata.category":
 		x.Category = ""
 	case "service.v1.Metadata.icon":
-		x.Icon = nil
+		x.Icon = ""
 	case "service.v1.Metadata.tags":
 		x.Tags = nil
 	default:
@@ -281,7 +281,7 @@ func (x *fastReflection_Metadata) Get(descriptor protoreflect.FieldDescriptor) p
 		return protoreflect.ValueOfString(value)
 	case "service.v1.Metadata.icon":
 		value := x.Icon
-		return protoreflect.ValueOfMessage(value.ProtoReflect())
+		return protoreflect.ValueOfString(value)
 	case "service.v1.Metadata.tags":
 		if len(x.Tags) == 0 {
 			return protoreflect.ValueOfList(&_Metadata_7_list{})
@@ -319,7 +319,7 @@ func (x *fastReflection_Metadata) Set(fd protoreflect.FieldDescriptor, value pro
 	case "service.v1.Metadata.category":
 		x.Category = value.Interface().(string)
 	case "service.v1.Metadata.icon":
-		x.Icon = value.Message().Interface().(*URI)
+		x.Icon = value.Interface().(string)
 	case "service.v1.Metadata.tags":
 		lv := value.List()
 		clv := lv.(*_Metadata_7_list)
@@ -344,11 +344,6 @@ func (x *fastReflection_Metadata) Set(fd protoreflect.FieldDescriptor, value pro
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Metadata) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "service.v1.Metadata.icon":
-		if x.Icon == nil {
-			x.Icon = new(URI)
-		}
-		return protoreflect.ValueOfMessage(x.Icon.ProtoReflect())
 	case "service.v1.Metadata.tags":
 		if x.Tags == nil {
 			x.Tags = []string{}
@@ -365,6 +360,8 @@ func (x *fastReflection_Metadata) Mutable(fd protoreflect.FieldDescriptor) proto
 		panic(fmt.Errorf("field description of message service.v1.Metadata is not mutable"))
 	case "service.v1.Metadata.category":
 		panic(fmt.Errorf("field category of message service.v1.Metadata is not mutable"))
+	case "service.v1.Metadata.icon":
+		panic(fmt.Errorf("field icon of message service.v1.Metadata is not mutable"))
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.Metadata"))
@@ -389,8 +386,7 @@ func (x *fastReflection_Metadata) NewField(fd protoreflect.FieldDescriptor) prot
 	case "service.v1.Metadata.category":
 		return protoreflect.ValueOfString("")
 	case "service.v1.Metadata.icon":
-		m := new(URI)
+		return protoreflect.ValueOfString("")
-		return protoreflect.ValueOfMessage(m.ProtoReflect())
 	case "service.v1.Metadata.tags":
 		list := []string{}
 		return protoreflect.ValueOfList(&_Metadata_7_list{list: &list})
@@ -482,8 +478,8 @@ func (x *fastReflection_Metadata) ProtoMethods() *protoiface.Methods {
 		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
-		if x.Icon != nil {
+		l = len(x.Icon)
-			l = options.Size(x.Icon)
+		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
 		if len(x.Tags) > 0 {
@@ -530,17 +526,10 @@ func (x *fastReflection_Metadata) ProtoMethods() *protoiface.Methods {
 				dAtA[i] = 0x3a
 			}
 		}
-		if x.Icon != nil {
+		if len(x.Icon) > 0 {
-			encoded, err := options.Marshal(x.Icon)
+			i -= len(x.Icon)
-			if err != nil {
+			copy(dAtA[i:], x.Icon)
-				return protoiface.MarshalOutput{
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Icon)))
-					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] = 0x32
 		}
@@ -777,7 +766,7 @@ func (x *fastReflection_Metadata) ProtoMethods() *protoiface.Methods {
 				if wireType != 2 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Icon", wireType)
 				}
-				var msglen int
+				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
 					if shift >= 64 {
 						return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow
@@ -787,27 +776,23 @@ func (x *fastReflection_Metadata) ProtoMethods() *protoiface.Methods {
 					}
 					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 protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength
 				}
-				postIndex := iNdEx + msglen
+				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
 				}
-				if x.Icon == nil {
+				x.Icon = string(dAtA[iNdEx:postIndex])
-					x.Icon = &URI{}
-				}
-				if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Icon); err != nil {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
-				}
 				iNdEx = postIndex
 			case 7:
 				if wireType != 2 {
@@ -1488,474 +1473,6 @@ func (x *fastReflection_Profile) ProtoMethods() *protoiface.Methods {
 	}
 }
 
-var (
-	md_URI          protoreflect.MessageDescriptor
-	fd_URI_protocol protoreflect.FieldDescriptor
-	fd_URI_uri      protoreflect.FieldDescriptor
-)
-
-func init() {
-	file_service_v1_state_proto_init()
-	md_URI = File_service_v1_state_proto.Messages().ByName("URI")
-	fd_URI_protocol = md_URI.Fields().ByName("protocol")
-	fd_URI_uri = md_URI.Fields().ByName("uri")
-}
-
-var _ protoreflect.Message = (*fastReflection_URI)(nil)
-
-type fastReflection_URI URI
-
-func (x *URI) ProtoReflect() protoreflect.Message {
-	return (*fastReflection_URI)(x)
-}
-
-func (x *URI) slowProtoReflect() protoreflect.Message {
-	mi := &file_service_v1_state_proto_msgTypes[2]
-	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_URI_messageType fastReflection_URI_messageType
-var _ protoreflect.MessageType = fastReflection_URI_messageType{}
-
-type fastReflection_URI_messageType struct{}
-
-func (x fastReflection_URI_messageType) Zero() protoreflect.Message {
-	return (*fastReflection_URI)(nil)
-}
-func (x fastReflection_URI_messageType) New() protoreflect.Message {
-	return new(fastReflection_URI)
-}
-func (x fastReflection_URI_messageType) Descriptor() protoreflect.MessageDescriptor {
-	return md_URI
-}
-
-// Descriptor returns message descriptor, which contains only the protobuf
-// type information for the message.
-func (x *fastReflection_URI) Descriptor() protoreflect.MessageDescriptor {
-	return md_URI
-}
-
-// 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_URI) Type() protoreflect.MessageType {
-	return _fastReflection_URI_messageType
-}
-
-// New returns a newly allocated and mutable empty message.
-func (x *fastReflection_URI) New() protoreflect.Message {
-	return new(fastReflection_URI)
-}
-
-// Interface unwraps the message reflection interface and
-// returns the underlying ProtoMessage interface.
-func (x *fastReflection_URI) Interface() protoreflect.ProtoMessage {
-	return (*URI)(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_URI) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
-	if x.Protocol != 0 {
-		value := protoreflect.ValueOfEnum((protoreflect.EnumNumber)(x.Protocol))
-		if !f(fd_URI_protocol, value) {
-			return
-		}
-	}
-	if x.Uri != "" {
-		value := protoreflect.ValueOfString(x.Uri)
-		if !f(fd_URI_uri, 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_URI) Has(fd protoreflect.FieldDescriptor) bool {
-	switch fd.FullName() {
-	case "service.v1.URI.protocol":
-		return x.Protocol != 0
-	case "service.v1.URI.uri":
-		return x.Uri != ""
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) Clear(fd protoreflect.FieldDescriptor) {
-	switch fd.FullName() {
-	case "service.v1.URI.protocol":
-		x.Protocol = 0
-	case "service.v1.URI.uri":
-		x.Uri = ""
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
-	switch descriptor.FullName() {
-	case "service.v1.URI.protocol":
-		value := x.Protocol
-		return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value))
-	case "service.v1.URI.uri":
-		value := x.Uri
-		return protoreflect.ValueOfString(value)
-	default:
-		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
-	switch fd.FullName() {
-	case "service.v1.URI.protocol":
-		x.Protocol = (URI_Protocol)(value.Enum())
-	case "service.v1.URI.uri":
-		x.Uri = value.Interface().(string)
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
-	switch fd.FullName() {
-	case "service.v1.URI.protocol":
-		panic(fmt.Errorf("field protocol of message service.v1.URI is not mutable"))
-	case "service.v1.URI.uri":
-		panic(fmt.Errorf("field uri of message service.v1.URI is not mutable"))
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
-	switch fd.FullName() {
-	case "service.v1.URI.protocol":
-		return protoreflect.ValueOfEnum(0)
-	case "service.v1.URI.uri":
-		return protoreflect.ValueOfString("")
-	default:
-		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: service.v1.URI"))
-		}
-		panic(fmt.Errorf("message service.v1.URI 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_URI) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
-	switch d.FullName() {
-	default:
-		panic(fmt.Errorf("%s is not a oneof field in service.v1.URI", 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_URI) 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_URI) 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_URI) 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_URI) ProtoMethods() *protoiface.Methods {
-	size := func(input protoiface.SizeInput) protoiface.SizeOutput {
-		x := input.Message.Interface().(*URI)
-		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.Protocol != 0 {
-			n += 1 + runtime.Sov(uint64(x.Protocol))
-		}
-		l = len(x.Uri)
-		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().(*URI)
-		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.Uri) > 0 {
-			i -= len(x.Uri)
-			copy(dAtA[i:], x.Uri)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Uri)))
-			i--
-			dAtA[i] = 0x12
-		}
-		if x.Protocol != 0 {
-			i = runtime.EncodeVarint(dAtA, i, uint64(x.Protocol))
-			i--
-			dAtA[i] = 0x8
-		}
-		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().(*URI)
-		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: URI: wiretype end group for non-group")
-			}
-			if fieldNum <= 0 {
-				return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: URI: illegal tag %d (wire type %d)", fieldNum, wire)
-			}
-			switch fieldNum {
-			case 1:
-				if wireType != 0 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Protocol", wireType)
-				}
-				x.Protocol = 0
-				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++
-					x.Protocol |= URI_Protocol(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-			case 2:
-				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Uri", 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.Uri = 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
@@ -1969,52 +1486,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type URI_Protocol int32
-
-const (
-	URI_HTTPS URI_Protocol = 0
-	URI_IPFS  URI_Protocol = 1
-)
-
-// Enum value maps for URI_Protocol.
-var (
-	URI_Protocol_name = map[int32]string{
-		0: "HTTPS",
-		1: "IPFS",
-	}
-	URI_Protocol_value = map[string]int32{
-		"HTTPS": 0,
-		"IPFS":  1,
-	}
-)
-
-func (x URI_Protocol) Enum() *URI_Protocol {
-	p := new(URI_Protocol)
-	*p = x
-	return p
-}
-
-func (x URI_Protocol) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (URI_Protocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_service_v1_state_proto_enumTypes[0].Descriptor()
-}
-
-func (URI_Protocol) Type() protoreflect.EnumType {
-	return &file_service_v1_state_proto_enumTypes[0]
-}
-
-func (x URI_Protocol) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use URI_Protocol.Descriptor instead.
-func (URI_Protocol) EnumDescriptor() ([]byte, []int) {
-	return file_service_v1_state_proto_rawDescGZIP(), []int{2, 0}
-}
-
 type Metadata struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2025,7 +1496,7 @@ type Metadata struct {
 	Name        string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	Description string   `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	Category    string   `protobuf:"bytes,5,opt,name=category,proto3" json:"category,omitempty"`
-	Icon        *URI     `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon,omitempty"`
+	Icon        string   `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon,omitempty"`
 	Tags        []string `protobuf:"bytes,7,rep,name=tags,proto3" json:"tags,omitempty"`
 }
 
@@ -2084,11 +1555,11 @@ func (x *Metadata) GetCategory() string {
 	return ""
 }
 
-func (x *Metadata) GetIcon() *URI {
+func (x *Metadata) GetIcon() string {
 	if x != nil {
 		return x.Icon
 	}
-	return nil
+	return ""
 }
 
 func (x *Metadata) GetTags() []string {
@@ -2162,56 +1633,13 @@ func (x *Profile) GetController() string {
 	return ""
 }
 
-type URI struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Protocol URI_Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=service.v1.URI_Protocol" json:"protocol,omitempty"`
-	Uri      string       `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"`
-}
-
-func (x *URI) Reset() {
-	*x = URI{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_service_v1_state_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *URI) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*URI) ProtoMessage() {}
-
-// Deprecated: Use URI.ProtoReflect.Descriptor instead.
-func (*URI) Descriptor() ([]byte, []int) {
-	return file_service_v1_state_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *URI) GetProtocol() URI_Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return URI_HTTPS
-}
-
-func (x *URI) GetUri() string {
-	if x != nil {
-		return x.Uri
-	}
-	return ""
-}
-
 var File_service_v1_state_proto protoreflect.FileDescriptor
 
 var file_service_v1_state_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x74, 0x61,
 	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x2e, 0x76, 0x31, 0x1a, 0x17, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x6f, 0x72, 0x6d,
-	0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdd, 0x01,
+	0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x72, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcc, 0x01,
 	0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72,
 	0x69, 0x67, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67,
@@ -2220,39 +1648,31 @@ var file_service_v1_state_proto_rawDesc = []byte{
 	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65,
 	0x67, 0x6f, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65,
-	0x67, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01,
+	0x67, 0x6f, 0x72, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73,
-	0x55, 0x52, 0x49, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67,
+	0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x3a, 0x1e, 0xf2, 0x9e,
-	0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x3a, 0x1e, 0xf2,
+	0xd3, 0x8e, 0x03, 0x18, 0x0a, 0x06, 0x0a, 0x02, 0x69, 0x64, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x06,
-	0x9e, 0xd3, 0x8e, 0x03, 0x18, 0x0a, 0x06, 0x0a, 0x02, 0x69, 0x64, 0x10, 0x01, 0x12, 0x0c, 0x0a,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x01, 0x22, 0x91, 0x01, 0x0a,
-	0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x01, 0x22, 0x91, 0x01,
+	0x07, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x0a, 0x07, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62,
+	0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65,
-	0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a,
+	0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x65, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20,
+	0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x3a, 0x24, 0xf2, 0x9e, 0xd3, 0x8e,
-	0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x3a, 0x24, 0xf2, 0x9e, 0xd3,
+	0x03, 0x1e, 0x0a, 0x04, 0x0a, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x0e, 0x73, 0x75, 0x62, 0x6a,
-	0x8e, 0x03, 0x1e, 0x0a, 0x04, 0x0a, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x0e, 0x73, 0x75, 0x62,
+	0x65, 0x63, 0x74, 0x2c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18, 0x02,
-	0x6a, 0x65, 0x63, 0x74, 0x2c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x10, 0x01, 0x18, 0x01, 0x18,
+	0x42, 0x96, 0x01, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x02, 0x22, 0x6e, 0x0a, 0x03, 0x55, 0x52, 0x49, 0x12, 0x34, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74,
+	0x2e, 0x76, 0x31, 0x42, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x73, 0x65, 0x72,
+	0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x52, 0x49, 0x2e, 0x50, 0x72, 0x6f, 0x74,
+	0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65,
-	0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x10,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69,
+	0x76, 0x31, 0xa2, 0x02, 0x03, 0x53, 0x58, 0x58, 0xaa, 0x02, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x22, 0x1f, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x09, 0x0a, 0x05,
+	0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c,
-	0x48, 0x54, 0x54, 0x50, 0x53, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x50, 0x46, 0x53, 0x10,
+	0x56, 0x31, 0xe2, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c,
-	0x01, 0x42, 0x96, 0x01, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0b, 0x53, 0x65,
-	0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f,
+	0x33,
-	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x53, 0x58, 0x58, 0xaa, 0x02, 0x0a, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x5c, 0x56, 0x31, 0xe2, 0x02, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0b, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
 }
 
 var (
@@ -2267,22 +1687,17 @@ func file_service_v1_state_proto_rawDescGZIP() []byte {
 	return file_service_v1_state_proto_rawDescData
 }
 
-var file_service_v1_state_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_service_v1_state_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_service_v1_state_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_service_v1_state_proto_goTypes = []interface{}{
-	(URI_Protocol)(0), // 0: service.v1.URI.Protocol
+	(*Metadata)(nil), // 0: service.v1.Metadata
-	(*Metadata)(nil),  // 1: service.v1.Metadata
+	(*Profile)(nil),  // 1: service.v1.Profile
-	(*Profile)(nil),   // 2: service.v1.Profile
-	(*URI)(nil),       // 3: service.v1.URI
 }
 var file_service_v1_state_proto_depIdxs = []int32{
-	3, // 0: service.v1.Metadata.icon:type_name -> service.v1.URI
+	0, // [0:0] is the sub-list for method output_type
-	0, // 1: service.v1.URI.protocol:type_name -> service.v1.URI.Protocol
+	0, // [0:0] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension extendee
-	2, // [2:2] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for field type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_service_v1_state_proto_init() }
@@ -2315,32 +1730,19 @@ func file_service_v1_state_proto_init() {
 				return nil
 			}
 		}
-		file_service_v1_state_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*URI); 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_service_v1_state_proto_rawDesc,
-			NumEnums:      1,
+			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
 		GoTypes:           file_service_v1_state_proto_goTypes,
 		DependencyIndexes: file_service_v1_state_proto_depIdxs,
-		EnumInfos:         file_service_v1_state_proto_enumTypes,
 		MessageInfos:      file_service_v1_state_proto_msgTypes,
 	}.Build()
 	File_service_v1_state_proto = out.File

api/vault/module/v1/module.pulsar.go

@@ -104,9 +104,9 @@ func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -120,9 +120,9 @@ func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -136,9 +136,9 @@ func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) pro
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -156,9 +156,9 @@ func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value proto
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -176,9 +176,9 @@ func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protore
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -189,9 +189,9 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: onsonr.sonr.vault.module.v1.Module"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: vault.module.v1.Module"))
 		}
-		panic(fmt.Errorf("message onsonr.sonr.vault.module.v1.Module does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message vault.module.v1.Module does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -201,7 +201,7 @@ func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protor
 func (x *fastReflection_Module) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in onsonr.sonr.vault.module.v1.Module", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in vault.module.v1.Module", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -414,30 +414,25 @@ var File_vault_module_v1_module_proto protoreflect.FileDescriptor
 
 var file_vault_module_v1_module_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76,
-	0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b,
+	0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f,
-	0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x76, 0x61, 0x75, 0x6c,
+	0x76, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a,
-	0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73,
+	0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c,
-	0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31,
+	0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x30, 0x0a,
+	0x6f, 0x22, 0x28, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x1e, 0xba, 0xc0, 0x96,
-	0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x26, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x20, 0x0a,
+	0xda, 0x01, 0x18, 0x0a, 0x16, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x1e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f,
+	0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x42, 0xb5, 0x01, 0x0a, 0x13,
-	0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x78, 0x2f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x42,
+	0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-	0xf4, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x73,
-	0x6f, 0x6e, 0x72, 0x2e, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
 	0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
 	0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f,
 	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
 	0x61, 0x75, 0x6c, 0x74, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x04, 0x4f, 0x53, 0x56, 0x4d, 0xaa, 0x02,
+	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x56, 0x4d, 0x58, 0xaa, 0x02, 0x0f,
-	0x1b, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2e, 0x53, 0x6f, 0x6e, 0x72, 0x2e, 0x56, 0x61, 0x75,
+	0x56, 0x61, 0x75, 0x6c, 0x74, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca,
-	0x6c, 0x74, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1b, 0x4f,
+	0x02, 0x0f, 0x56, 0x61, 0x75, 0x6c, 0x74, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56,
-	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x56, 0x61, 0x75, 0x6c, 0x74,
+	0x31, 0xe2, 0x02, 0x1b, 0x56, 0x61, 0x75, 0x6c, 0x74, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
-	0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x27, 0x4f, 0x6e, 0x73,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x6f, 0x6e, 0x72, 0x5c, 0x53, 0x6f, 0x6e, 0x72, 0x5c, 0x56, 0x61, 0x75, 0x6c, 0x74, 0x5c, 0x4d,
+	0x02, 0x11, 0x56, 0x61, 0x75, 0x6c, 0x74, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a,
-	0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
+	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1f, 0x4f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x53,
-	0x6f, 0x6e, 0x72, 0x3a, 0x3a, 0x56, 0x61, 0x75, 0x6c, 0x74, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75,
-	0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -454,7 +449,7 @@ func file_vault_module_v1_module_proto_rawDescGZIP() []byte {
 
 var file_vault_module_v1_module_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_vault_module_v1_module_proto_goTypes = []interface{}{
-	(*Module)(nil), // 0: onsonr.sonr.vault.module.v1.Module
+	(*Module)(nil), // 0: vault.module.v1.Module
 }
 var file_vault_module_v1_module_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type

buf.work.yaml

@@ -0,0 +1,4 @@
+version: v1
+directories:
+  - proto
+  - third_party/proto

cmd/dwn/main.go

@@ -1,20 +1,64 @@
 //go:build js && wasm
 // +build js,wasm
 
-package fetch
+package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"strings"
 	"syscall/js"
 
+	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
+
+	"github.com/onsonr/sonr/pkg/common/ctx"
+	dwngen "github.com/onsonr/sonr/pkg/motr/config"
+	"github.com/onsonr/sonr/pkg/motr/routes"
 )
 
+const FileNameConfigJSON = "dwn.json"
+
+var config *dwngen.Config
+
+func main() {
+	// Load dwn config
+	if err := loadDwnConfig(); err != nil {
+		panic(err)
+	}
+
+	// Setup HTTP server
+	e := echo.New()
+	e.Use(ctx.DWNSessionMiddleware(config))
+	routes.RegisterWebNodeAPI(e)
+	routes.RegisterWebNodeViews(e)
+	Serve(e)
+}
+
+func loadDwnConfig() error {
+	// Read dwn.json config
+	dwnBz, err := os.ReadFile(FileNameConfigJSON)
+	if err != nil {
+		return err
+	}
+	dwnConfig := new(dwngen.Config)
+	err = json.Unmarshal(dwnBz, dwnConfig)
+	if err != nil {
+		return err
+	}
+	config = dwnConfig
+	return nil
+}
+
+// ╭───────────────────────────────────────────────────────╮
+// │                  Serve HTTP Requests                  │
+// ╰───────────────────────────────────────────────────────╯
+
 // Serve serves HTTP requests using handler or http.DefaultServeMux if handler is nil.
 func Serve(handler http.Handler) func() {
 	h := handler

cmd/gateway/main.go

@@ -4,15 +4,16 @@ package main
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/ctx"
-	"github.com/onsonr/sonr/pkg/workers/routes"
 	"github.com/syumai/workers"
+
+	"github.com/onsonr/sonr/pkg/common/ctx"
+	"github.com/onsonr/sonr/pkg/hway/routes"
 )
 
 func main() {
 	s := echo.New()
 	s.Use(ctx.HighwaySessionMiddleware)
 	routes.RegisterGatewayViews(s)
-	routes.RegisterGatewayAPI(s)
+	routes.RegisterGatewayViews(s)
 	workers.Serve(s)
 }

go.mod

@@ -22,7 +22,6 @@ replace (
 	// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
 	// See: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
-	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
 	// See: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1
 
@@ -87,7 +86,6 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2
-	gopkg.in/macaroon.v2 v2.1.0
 )
 
 require (

go.sum

@@ -1121,7 +1121,6 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
-github.com/frankban/quicktest v1.0.0/go.mod h1:R98jIehRai+d1/3Hv2//jOVCTJhW1VBavT6B6CuGq2k=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
@@ -2149,7 +2148,6 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
 go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
 go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
-golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -2975,8 +2973,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/macaroon.v2 v2.1.0 h1:HZcsjBCzq9t0eBPMKqTN/uSN6JOm78ZJ2INbqcBQOUI=
-gopkg.in/macaroon.v2 v2.1.0/go.mod h1:OUb+TQP/OP0WOerC2Jp/3CwhIKyIa9kQjuc7H24e6/o=
 gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=

internal/dwn/gen/init.pkl.go

@@ -1,10 +0,0 @@
-// Code generated from Pkl module `dwngen`. DO NOT EDIT.
-package gen
-
-import "github.com/apple/pkl-go/pkl"
-
-func init() {
-	pkl.RegisterMapping("dwngen", Dwngen{})
-	pkl.RegisterMapping("dwngen#Config", Config{})
-	pkl.RegisterMapping("dwngen#Schema", Schema{})
-}

internal/dwn/wasm/main.go

@@ -1,48 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package main
-
-import (
-	"encoding/json"
-	"os"
-
-	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/ctx"
-	"github.com/onsonr/sonr/internal/dwn/fetch"
-	dwngen "github.com/onsonr/sonr/internal/dwn/gen"
-	"github.com/onsonr/sonr/pkg/workers/routes"
-)
-
-const FileNameConfigJSON = "dwn.json"
-
-var config *dwngen.Config
-
-func main() {
-	// Load dwn config
-	if err := loadDwnConfig(); err != nil {
-		panic(err)
-	}
-
-	// Setup HTTP server
-	e := echo.New()
-	e.Use(ctx.DWNSessionMiddleware(config))
-	routes.RegisterWebNodeAPI(e)
-	routes.RegisterWebNodeViews(e)
-	fetch.Serve(e)
-}
-
-func loadDwnConfig() error {
-	// Read dwn.json config
-	dwnBz, err := os.ReadFile(FileNameConfigJSON)
-	if err != nil {
-		return err
-	}
-	dwnConfig := new(dwngen.Config)
-	err = json.Unmarshal(dwnBz, dwnConfig)
-	if err != nil {
-		return err
-	}
-	config = dwnConfig
-	return nil
-}

internal/orm/transactions/Msg.pkl.go

@@ -1,6 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-type Msg interface {
-	GetTypeUrl() string
-}

internal/orm/transactions/MsgDidAllocateVault.pkl.go

@@ -1,44 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidAllocateVault interface {
-	Msg
-
-	GetAuthority() string
-
-	GetSubject() string
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidAllocateVault = (*MsgDidAllocateVaultImpl)(nil)
-
-type MsgDidAllocateVaultImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Authority string `pkl:"authority"`
-
-	Subject string `pkl:"subject"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidAllocateVaultImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidAllocateVaultImpl) GetAuthority() string {
-	return rcv.Authority
-}
-
-func (rcv *MsgDidAllocateVaultImpl) GetSubject() string {
-	return rcv.Subject
-}
-
-func (rcv *MsgDidAllocateVaultImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidAuthorize.pkl.go

@@ -1,60 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidAuthorize interface {
-	Msg
-
-	GetAuthority() string
-
-	GetController() string
-
-	GetAddress() string
-
-	GetOrigin() string
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidAuthorize = (*MsgDidAuthorizeImpl)(nil)
-
-type MsgDidAuthorizeImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Authority string `pkl:"authority"`
-
-	Controller string `pkl:"controller"`
-
-	Address string `pkl:"address"`
-
-	Origin string `pkl:"origin"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidAuthorizeImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidAuthorizeImpl) GetAuthority() string {
-	return rcv.Authority
-}
-
-func (rcv *MsgDidAuthorizeImpl) GetController() string {
-	return rcv.Controller
-}
-
-func (rcv *MsgDidAuthorizeImpl) GetAddress() string {
-	return rcv.Address
-}
-
-func (rcv *MsgDidAuthorizeImpl) GetOrigin() string {
-	return rcv.Origin
-}
-
-func (rcv *MsgDidAuthorizeImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidProveWitness.pkl.go

@@ -1,52 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidProveWitness interface {
-	Msg
-
-	GetAuthority() string
-
-	GetProperty() string
-
-	GetWitness() []int
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidProveWitness = (*MsgDidProveWitnessImpl)(nil)
-
-type MsgDidProveWitnessImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Authority string `pkl:"authority"`
-
-	Property string `pkl:"property"`
-
-	Witness []int `pkl:"witness"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidProveWitnessImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidProveWitnessImpl) GetAuthority() string {
-	return rcv.Authority
-}
-
-func (rcv *MsgDidProveWitnessImpl) GetProperty() string {
-	return rcv.Property
-}
-
-func (rcv *MsgDidProveWitnessImpl) GetWitness() []int {
-	return rcv.Witness
-}
-
-func (rcv *MsgDidProveWitnessImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidRegisterController.pkl.go

@@ -1,60 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidRegisterController interface {
-	Msg
-
-	GetAuthority() string
-
-	GetCid() string
-
-	GetOrigin() string
-
-	GetAuthentication() []*pkl.Object
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidRegisterController = (*MsgDidRegisterControllerImpl)(nil)
-
-type MsgDidRegisterControllerImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Authority string `pkl:"authority"`
-
-	Cid string `pkl:"cid"`
-
-	Origin string `pkl:"origin"`
-
-	Authentication []*pkl.Object `pkl:"authentication"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidRegisterControllerImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidRegisterControllerImpl) GetAuthority() string {
-	return rcv.Authority
-}
-
-func (rcv *MsgDidRegisterControllerImpl) GetCid() string {
-	return rcv.Cid
-}
-
-func (rcv *MsgDidRegisterControllerImpl) GetOrigin() string {
-	return rcv.Origin
-}
-
-func (rcv *MsgDidRegisterControllerImpl) GetAuthentication() []*pkl.Object {
-	return rcv.Authentication
-}
-
-func (rcv *MsgDidRegisterControllerImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidRegisterService.pkl.go

@@ -1,76 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidRegisterService interface {
-	Msg
-
-	GetController() string
-
-	GetOriginUri() string
-
-	GetScopes() *pkl.Object
-
-	GetDescription() string
-
-	GetServiceEndpoints() map[string]string
-
-	GetMetadata() *pkl.Object
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidRegisterService = (*MsgDidRegisterServiceImpl)(nil)
-
-type MsgDidRegisterServiceImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Controller string `pkl:"controller"`
-
-	OriginUri string `pkl:"originUri"`
-
-	Scopes *pkl.Object `pkl:"scopes"`
-
-	Description string `pkl:"description"`
-
-	ServiceEndpoints map[string]string `pkl:"serviceEndpoints"`
-
-	Metadata *pkl.Object `pkl:"metadata"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidRegisterServiceImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetController() string {
-	return rcv.Controller
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetOriginUri() string {
-	return rcv.OriginUri
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetScopes() *pkl.Object {
-	return rcv.Scopes
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetDescription() string {
-	return rcv.Description
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetServiceEndpoints() map[string]string {
-	return rcv.ServiceEndpoints
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetMetadata() *pkl.Object {
-	return rcv.Metadata
-}
-
-func (rcv *MsgDidRegisterServiceImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidSyncVault.pkl.go

@@ -1,36 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidSyncVault interface {
-	Msg
-
-	GetController() string
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidSyncVault = (*MsgDidSyncVaultImpl)(nil)
-
-type MsgDidSyncVaultImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Controller string `pkl:"controller"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidSyncVaultImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidSyncVaultImpl) GetController() string {
-	return rcv.Controller
-}
-
-func (rcv *MsgDidSyncVaultImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgDidUpdateParams.pkl.go

@@ -1,44 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgDidUpdateParams interface {
-	Msg
-
-	GetAuthority() string
-
-	GetParams() *pkl.Object
-
-	GetToken() *pkl.Object
-}
-
-var _ MsgDidUpdateParams = (*MsgDidUpdateParamsImpl)(nil)
-
-type MsgDidUpdateParamsImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Authority string `pkl:"authority"`
-
-	Params *pkl.Object `pkl:"params"`
-
-	Token *pkl.Object `pkl:"token"`
-}
-
-// The type URL for the message
-func (rcv *MsgDidUpdateParamsImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgDidUpdateParamsImpl) GetAuthority() string {
-	return rcv.Authority
-}
-
-func (rcv *MsgDidUpdateParamsImpl) GetParams() *pkl.Object {
-	return rcv.Params
-}
-
-func (rcv *MsgDidUpdateParamsImpl) GetToken() *pkl.Object {
-	return rcv.Token
-}

internal/orm/transactions/MsgGovDeposit.pkl.go

@@ -1,44 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgGovDeposit interface {
-	Msg
-
-	GetProposalId() int
-
-	GetDepositor() string
-
-	GetAmount() []*pkl.Object
-}
-
-var _ MsgGovDeposit = (*MsgGovDepositImpl)(nil)
-
-type MsgGovDepositImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	ProposalId int `pkl:"proposalId"`
-
-	Depositor string `pkl:"depositor"`
-
-	Amount []*pkl.Object `pkl:"amount"`
-}
-
-// The type URL for the message
-func (rcv *MsgGovDepositImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGovDepositImpl) GetProposalId() int {
-	return rcv.ProposalId
-}
-
-func (rcv *MsgGovDepositImpl) GetDepositor() string {
-	return rcv.Depositor
-}
-
-func (rcv *MsgGovDepositImpl) GetAmount() []*pkl.Object {
-	return rcv.Amount
-}

internal/orm/transactions/MsgGovSubmitProposal.pkl.go

@@ -1,45 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgGovSubmitProposal interface {
-	Msg
-
-	GetContent() *Proposal
-
-	GetInitialDeposit() []*pkl.Object
-
-	GetProposer() string
-}
-
-var _ MsgGovSubmitProposal = (*MsgGovSubmitProposalImpl)(nil)
-
-// Gov module messages
-type MsgGovSubmitProposalImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Content *Proposal `pkl:"content"`
-
-	InitialDeposit []*pkl.Object `pkl:"initialDeposit"`
-
-	Proposer string `pkl:"proposer"`
-}
-
-// The type URL for the message
-func (rcv *MsgGovSubmitProposalImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGovSubmitProposalImpl) GetContent() *Proposal {
-	return rcv.Content
-}
-
-func (rcv *MsgGovSubmitProposalImpl) GetInitialDeposit() []*pkl.Object {
-	return rcv.InitialDeposit
-}
-
-func (rcv *MsgGovSubmitProposalImpl) GetProposer() string {
-	return rcv.Proposer
-}

internal/orm/transactions/MsgGovVote.pkl.go

@@ -1,42 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-type MsgGovVote interface {
-	Msg
-
-	GetProposalId() int
-
-	GetVoter() string
-
-	GetOption() int
-}
-
-var _ MsgGovVote = (*MsgGovVoteImpl)(nil)
-
-type MsgGovVoteImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	ProposalId int `pkl:"proposalId"`
-
-	Voter string `pkl:"voter"`
-
-	Option int `pkl:"option"`
-}
-
-// The type URL for the message
-func (rcv *MsgGovVoteImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGovVoteImpl) GetProposalId() int {
-	return rcv.ProposalId
-}
-
-func (rcv *MsgGovVoteImpl) GetVoter() string {
-	return rcv.Voter
-}
-
-func (rcv *MsgGovVoteImpl) GetOption() int {
-	return rcv.Option
-}

internal/orm/transactions/MsgGroupCreateGroup.pkl.go

@@ -1,45 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgGroupCreateGroup interface {
-	Msg
-
-	GetAdmin() string
-
-	GetMembers() []*pkl.Object
-
-	GetMetadata() string
-}
-
-var _ MsgGroupCreateGroup = (*MsgGroupCreateGroupImpl)(nil)
-
-// Group module messages
-type MsgGroupCreateGroupImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Admin string `pkl:"admin"`
-
-	Members []*pkl.Object `pkl:"members"`
-
-	Metadata string `pkl:"metadata"`
-}
-
-// The type URL for the message
-func (rcv *MsgGroupCreateGroupImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGroupCreateGroupImpl) GetAdmin() string {
-	return rcv.Admin
-}
-
-func (rcv *MsgGroupCreateGroupImpl) GetMembers() []*pkl.Object {
-	return rcv.Members
-}
-
-func (rcv *MsgGroupCreateGroupImpl) GetMetadata() string {
-	return rcv.Metadata
-}

internal/orm/transactions/MsgGroupSubmitProposal.pkl.go

@@ -1,60 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgGroupSubmitProposal interface {
-	Msg
-
-	GetGroupPolicyAddress() string
-
-	GetProposers() []string
-
-	GetMetadata() string
-
-	GetMessages() []*pkl.Object
-
-	GetExec() int
-}
-
-var _ MsgGroupSubmitProposal = (*MsgGroupSubmitProposalImpl)(nil)
-
-type MsgGroupSubmitProposalImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	GroupPolicyAddress string `pkl:"groupPolicyAddress"`
-
-	Proposers []string `pkl:"proposers"`
-
-	Metadata string `pkl:"metadata"`
-
-	Messages []*pkl.Object `pkl:"messages"`
-
-	Exec int `pkl:"exec"`
-}
-
-// The type URL for the message
-func (rcv *MsgGroupSubmitProposalImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGroupSubmitProposalImpl) GetGroupPolicyAddress() string {
-	return rcv.GroupPolicyAddress
-}
-
-func (rcv *MsgGroupSubmitProposalImpl) GetProposers() []string {
-	return rcv.Proposers
-}
-
-func (rcv *MsgGroupSubmitProposalImpl) GetMetadata() string {
-	return rcv.Metadata
-}
-
-func (rcv *MsgGroupSubmitProposalImpl) GetMessages() []*pkl.Object {
-	return rcv.Messages
-}
-
-func (rcv *MsgGroupSubmitProposalImpl) GetExec() int {
-	return rcv.Exec
-}

internal/orm/transactions/MsgGroupVote.pkl.go

@@ -1,58 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-type MsgGroupVote interface {
-	Msg
-
-	GetProposalId() int
-
-	GetVoter() string
-
-	GetOption() int
-
-	GetMetadata() string
-
-	GetExec() int
-}
-
-var _ MsgGroupVote = (*MsgGroupVoteImpl)(nil)
-
-type MsgGroupVoteImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	ProposalId int `pkl:"proposalId"`
-
-	Voter string `pkl:"voter"`
-
-	Option int `pkl:"option"`
-
-	Metadata string `pkl:"metadata"`
-
-	Exec int `pkl:"exec"`
-}
-
-// The type URL for the message
-func (rcv *MsgGroupVoteImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgGroupVoteImpl) GetProposalId() int {
-	return rcv.ProposalId
-}
-
-func (rcv *MsgGroupVoteImpl) GetVoter() string {
-	return rcv.Voter
-}
-
-func (rcv *MsgGroupVoteImpl) GetOption() int {
-	return rcv.Option
-}
-
-func (rcv *MsgGroupVoteImpl) GetMetadata() string {
-	return rcv.Metadata
-}
-
-func (rcv *MsgGroupVoteImpl) GetExec() int {
-	return rcv.Exec
-}

internal/orm/transactions/MsgStakingBeginRedelegate.pkl.go

@@ -1,52 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgStakingBeginRedelegate interface {
-	Msg
-
-	GetDelegatorAddress() string
-
-	GetValidatorSrcAddress() string
-
-	GetValidatorDstAddress() string
-
-	GetAmount() *pkl.Object
-}
-
-var _ MsgStakingBeginRedelegate = (*MsgStakingBeginRedelegateImpl)(nil)
-
-type MsgStakingBeginRedelegateImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	DelegatorAddress string `pkl:"delegatorAddress"`
-
-	ValidatorSrcAddress string `pkl:"validatorSrcAddress"`
-
-	ValidatorDstAddress string `pkl:"validatorDstAddress"`
-
-	Amount *pkl.Object `pkl:"amount"`
-}
-
-// The type URL for the message
-func (rcv *MsgStakingBeginRedelegateImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgStakingBeginRedelegateImpl) GetDelegatorAddress() string {
-	return rcv.DelegatorAddress
-}
-
-func (rcv *MsgStakingBeginRedelegateImpl) GetValidatorSrcAddress() string {
-	return rcv.ValidatorSrcAddress
-}
-
-func (rcv *MsgStakingBeginRedelegateImpl) GetValidatorDstAddress() string {
-	return rcv.ValidatorDstAddress
-}
-
-func (rcv *MsgStakingBeginRedelegateImpl) GetAmount() *pkl.Object {
-	return rcv.Amount
-}

internal/orm/transactions/MsgStakingCreateValidator.pkl.go

@@ -1,77 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgStakingCreateValidator interface {
-	Msg
-
-	GetDescription() *pkl.Object
-
-	GetCommission() *pkl.Object
-
-	GetMinSelfDelegation() string
-
-	GetDelegatorAddress() string
-
-	GetValidatorAddress() string
-
-	GetPubkey() *pkl.Object
-
-	GetValue() *pkl.Object
-}
-
-var _ MsgStakingCreateValidator = (*MsgStakingCreateValidatorImpl)(nil)
-
-// Staking module messages
-type MsgStakingCreateValidatorImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	Description *pkl.Object `pkl:"description"`
-
-	Commission *pkl.Object `pkl:"commission"`
-
-	MinSelfDelegation string `pkl:"minSelfDelegation"`
-
-	DelegatorAddress string `pkl:"delegatorAddress"`
-
-	ValidatorAddress string `pkl:"validatorAddress"`
-
-	Pubkey *pkl.Object `pkl:"pubkey"`
-
-	Value *pkl.Object `pkl:"value"`
-}
-
-// The type URL for the message
-func (rcv *MsgStakingCreateValidatorImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetDescription() *pkl.Object {
-	return rcv.Description
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetCommission() *pkl.Object {
-	return rcv.Commission
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetMinSelfDelegation() string {
-	return rcv.MinSelfDelegation
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetDelegatorAddress() string {
-	return rcv.DelegatorAddress
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetValidatorAddress() string {
-	return rcv.ValidatorAddress
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetPubkey() *pkl.Object {
-	return rcv.Pubkey
-}
-
-func (rcv *MsgStakingCreateValidatorImpl) GetValue() *pkl.Object {
-	return rcv.Value
-}

internal/orm/transactions/MsgStakingDelegate.pkl.go

@@ -1,44 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgStakingDelegate interface {
-	Msg
-
-	GetDelegatorAddress() string
-
-	GetValidatorAddress() string
-
-	GetAmount() *pkl.Object
-}
-
-var _ MsgStakingDelegate = (*MsgStakingDelegateImpl)(nil)
-
-type MsgStakingDelegateImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	DelegatorAddress string `pkl:"delegatorAddress"`
-
-	ValidatorAddress string `pkl:"validatorAddress"`
-
-	Amount *pkl.Object `pkl:"amount"`
-}
-
-// The type URL for the message
-func (rcv *MsgStakingDelegateImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgStakingDelegateImpl) GetDelegatorAddress() string {
-	return rcv.DelegatorAddress
-}
-
-func (rcv *MsgStakingDelegateImpl) GetValidatorAddress() string {
-	return rcv.ValidatorAddress
-}
-
-func (rcv *MsgStakingDelegateImpl) GetAmount() *pkl.Object {
-	return rcv.Amount
-}

internal/orm/transactions/MsgStakingUndelegate.pkl.go

@@ -1,44 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-type MsgStakingUndelegate interface {
-	Msg
-
-	GetDelegatorAddress() string
-
-	GetValidatorAddress() string
-
-	GetAmount() *pkl.Object
-}
-
-var _ MsgStakingUndelegate = (*MsgStakingUndelegateImpl)(nil)
-
-type MsgStakingUndelegateImpl struct {
-	// The type URL for the message
-	TypeUrl string `pkl:"typeUrl"`
-
-	DelegatorAddress string `pkl:"delegatorAddress"`
-
-	ValidatorAddress string `pkl:"validatorAddress"`
-
-	Amount *pkl.Object `pkl:"amount"`
-}
-
-// The type URL for the message
-func (rcv *MsgStakingUndelegateImpl) GetTypeUrl() string {
-	return rcv.TypeUrl
-}
-
-func (rcv *MsgStakingUndelegateImpl) GetDelegatorAddress() string {
-	return rcv.DelegatorAddress
-}
-
-func (rcv *MsgStakingUndelegateImpl) GetValidatorAddress() string {
-	return rcv.ValidatorAddress
-}
-
-func (rcv *MsgStakingUndelegateImpl) GetAmount() *pkl.Object {
-	return rcv.Amount
-}

internal/orm/transactions/Proposal.pkl.go

@@ -1,11 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-// Base class for all proposals
-type Proposal struct {
-	// The title of the proposal
-	Title string `pkl:"title"`
-
-	// The description of the proposal
-	Description string `pkl:"description"`
-}

internal/orm/transactions/Transactions.pkl.go

@@ -1,36 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import (
-	"context"
-
-	"github.com/apple/pkl-go/pkl"
-)
-
-type Transactions struct {
-}
-
-// LoadFromPath loads the pkl module at the given path and evaluates it into a Transactions
-func LoadFromPath(ctx context.Context, path string) (ret *Transactions, err error) {
-	evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		cerr := evaluator.Close()
-		if err == nil {
-			err = cerr
-		}
-	}()
-	ret, err = Load(ctx, evaluator, pkl.FileSource(path))
-	return ret, err
-}
-
-// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Transactions
-func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Transactions, error) {
-	var ret Transactions
-	if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil {
-		return nil, err
-	}
-	return &ret, nil
-}

internal/orm/transactions/TxBody.pkl.go

@@ -1,17 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-// Represents a transaction body
-type TxBody struct {
-	Messages []Msg `pkl:"messages"`
-
-	Memo *string `pkl:"memo"`
-
-	TimeoutHeight *int `pkl:"timeoutHeight"`
-
-	ExtensionOptions *[]*pkl.Object `pkl:"extensionOptions"`
-
-	NonCriticalExtensionOptions *[]*pkl.Object `pkl:"nonCriticalExtensionOptions"`
-}

internal/orm/transactions/init.pkl.go

@@ -1,27 +0,0 @@
-// Code generated from Pkl module `transactions`. DO NOT EDIT.
-package transactions
-
-import "github.com/apple/pkl-go/pkl"
-
-func init() {
-	pkl.RegisterMapping("transactions", Transactions{})
-	pkl.RegisterMapping("transactions#Proposal", Proposal{})
-	pkl.RegisterMapping("transactions#MsgGovSubmitProposal", MsgGovSubmitProposalImpl{})
-	pkl.RegisterMapping("transactions#MsgGovVote", MsgGovVoteImpl{})
-	pkl.RegisterMapping("transactions#MsgGovDeposit", MsgGovDepositImpl{})
-	pkl.RegisterMapping("transactions#MsgGroupCreateGroup", MsgGroupCreateGroupImpl{})
-	pkl.RegisterMapping("transactions#MsgGroupSubmitProposal", MsgGroupSubmitProposalImpl{})
-	pkl.RegisterMapping("transactions#MsgGroupVote", MsgGroupVoteImpl{})
-	pkl.RegisterMapping("transactions#MsgStakingCreateValidator", MsgStakingCreateValidatorImpl{})
-	pkl.RegisterMapping("transactions#MsgStakingDelegate", MsgStakingDelegateImpl{})
-	pkl.RegisterMapping("transactions#MsgStakingUndelegate", MsgStakingUndelegateImpl{})
-	pkl.RegisterMapping("transactions#MsgStakingBeginRedelegate", MsgStakingBeginRedelegateImpl{})
-	pkl.RegisterMapping("transactions#MsgDidUpdateParams", MsgDidUpdateParamsImpl{})
-	pkl.RegisterMapping("transactions#MsgDidAllocateVault", MsgDidAllocateVaultImpl{})
-	pkl.RegisterMapping("transactions#MsgDidProveWitness", MsgDidProveWitnessImpl{})
-	pkl.RegisterMapping("transactions#MsgDidSyncVault", MsgDidSyncVaultImpl{})
-	pkl.RegisterMapping("transactions#MsgDidRegisterController", MsgDidRegisterControllerImpl{})
-	pkl.RegisterMapping("transactions#MsgDidAuthorize", MsgDidAuthorizeImpl{})
-	pkl.RegisterMapping("transactions#MsgDidRegisterService", MsgDidRegisterServiceImpl{})
-	pkl.RegisterMapping("transactions#TxBody", TxBody{})
-}

pkg/common/README.md

@@ -0,0 +1 @@
+# Common

pkg/common/ctx/ctx_dwn.go

@@ -5,7 +5,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	dwngen "github.com/onsonr/sonr/internal/dwn/gen"
+
+	"github.com/onsonr/sonr/pkg/motr/config"
 )
 
 // ╭───────────────────────────────────────────────────────────╮
@@ -51,12 +52,12 @@ func (s *DWNContext) ChainID() string {
 }
 
 // Schema returns the vault schema from the cookies.
-func (s *DWNContext) Schema() *dwngen.Schema {
+func (s *DWNContext) Schema() *config.Schema {
 	v, err := ReadCookie(s.Context, CookieKeyVaultSchema)
 	if err != nil {
 		return nil
 	}
-	var schema dwngen.Schema
+	var schema config.Schema
 	err = json.Unmarshal([]byte(v), &schema)
 	if err != nil {
 		return nil
@@ -74,7 +75,7 @@ func GetDWNContext(c echo.Context) (*DWNContext, error) {
 }
 
 // HighwaySessionMiddleware establishes a Session Cookie.
-func DWNSessionMiddleware(config *dwngen.Config) echo.MiddlewareFunc {
+func DWNSessionMiddleware(config *config.Config) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			sessionID := GetSessionID(c)

pkg/common/ctx/headers.go

@@ -4,7 +4,8 @@ import (
 	"encoding/json"
 
 	"github.com/labstack/echo/v4"
-	dwngen "github.com/onsonr/sonr/internal/dwn/gen"
+
+	dwngen "github.com/onsonr/sonr/pkg/motr/config"
 )
 
 type HeaderKey string

pkg/common/types/ipfs.pb.go

@@ -0,0 +1,64 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: common/v1/ipfs.proto
+
+package commonv1
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+)
+
+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)
+)
+
+var File_common_v1_ipfs_proto protoreflect.FileDescriptor
+
+var file_common_v1_ipfs_proto_rawDesc = []byte{
+	0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x70, 0x66, 0x73,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76,
+	0x31, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var file_common_v1_ipfs_proto_goTypes = []interface{}{}
+var file_common_v1_ipfs_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_common_v1_ipfs_proto_init() }
+func file_common_v1_ipfs_proto_init() {
+	if File_common_v1_ipfs_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_common_v1_ipfs_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   0,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_common_v1_ipfs_proto_goTypes,
+		DependencyIndexes: file_common_v1_ipfs_proto_depIdxs,
+	}.Build()
+	File_common_v1_ipfs_proto = out.File
+	file_common_v1_ipfs_proto_rawDesc = nil
+	file_common_v1_ipfs_proto_goTypes = nil
+	file_common_v1_ipfs_proto_depIdxs = nil
+}

pkg/common/types/keys.pb.go

@@ -0,0 +1,377 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: common/v1/keys.proto
+
+package commonv1
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+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)
+)
+
+// PubKey defines a public key for a did
+type PubKey struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Role    string      `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"`
+	KeyType string      `protobuf:"bytes,2,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
+	RawKey  *RawKey     `protobuf:"bytes,3,opt,name=raw_key,json=rawKey,proto3" json:"raw_key,omitempty"`
+	Jwk     *JSONWebKey `protobuf:"bytes,4,opt,name=jwk,proto3" json:"jwk,omitempty"`
+}
+
+func (x *PubKey) Reset() {
+	*x = PubKey{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_v1_keys_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PubKey) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PubKey) ProtoMessage() {}
+
+func (x *PubKey) ProtoReflect() protoreflect.Message {
+	mi := &file_common_v1_keys_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)
+}
+
+// Deprecated: Use PubKey.ProtoReflect.Descriptor instead.
+func (*PubKey) Descriptor() ([]byte, []int) {
+	return file_common_v1_keys_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *PubKey) GetRole() string {
+	if x != nil {
+		return x.Role
+	}
+	return ""
+}
+
+func (x *PubKey) GetKeyType() string {
+	if x != nil {
+		return x.KeyType
+	}
+	return ""
+}
+
+func (x *PubKey) GetRawKey() *RawKey {
+	if x != nil {
+		return x.RawKey
+	}
+	return nil
+}
+
+func (x *PubKey) GetJwk() *JSONWebKey {
+	if x != nil {
+		return x.Jwk
+	}
+	return nil
+}
+
+// JWK represents a JSON Web Key
+type JSONWebKey struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Kty string `protobuf:"bytes,1,opt,name=kty,proto3" json:"kty,omitempty"` // Key Type
+	Crv string `protobuf:"bytes,2,opt,name=crv,proto3" json:"crv,omitempty"` // Curve (for EC and OKP keys)
+	X   string `protobuf:"bytes,3,opt,name=x,proto3" json:"x,omitempty"`     // X coordinate (for EC and OKP keys)
+	Y   string `protobuf:"bytes,4,opt,name=y,proto3" json:"y,omitempty"`     // Y coordinate (for EC keys)
+	N   string `protobuf:"bytes,5,opt,name=n,proto3" json:"n,omitempty"`     // Modulus (for RSA keys)
+	E   string `protobuf:"bytes,6,opt,name=e,proto3" json:"e,omitempty"`     // Exponent (for RSA keys)
+}
+
+func (x *JSONWebKey) Reset() {
+	*x = JSONWebKey{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_v1_keys_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *JSONWebKey) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*JSONWebKey) ProtoMessage() {}
+
+func (x *JSONWebKey) ProtoReflect() protoreflect.Message {
+	mi := &file_common_v1_keys_proto_msgTypes[1]
+	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)
+}
+
+// Deprecated: Use JSONWebKey.ProtoReflect.Descriptor instead.
+func (*JSONWebKey) Descriptor() ([]byte, []int) {
+	return file_common_v1_keys_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *JSONWebKey) GetKty() string {
+	if x != nil {
+		return x.Kty
+	}
+	return ""
+}
+
+func (x *JSONWebKey) GetCrv() string {
+	if x != nil {
+		return x.Crv
+	}
+	return ""
+}
+
+func (x *JSONWebKey) GetX() string {
+	if x != nil {
+		return x.X
+	}
+	return ""
+}
+
+func (x *JSONWebKey) GetY() string {
+	if x != nil {
+		return x.Y
+	}
+	return ""
+}
+
+func (x *JSONWebKey) GetN() string {
+	if x != nil {
+		return x.N
+	}
+	return ""
+}
+
+func (x *JSONWebKey) GetE() string {
+	if x != nil {
+		return x.E
+	}
+	return ""
+}
+
+type RawKey struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Algorithm string `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"`
+	Encoding  string `protobuf:"bytes,2,opt,name=encoding,proto3" json:"encoding,omitempty"`
+	Curve     string `protobuf:"bytes,3,opt,name=curve,proto3" json:"curve,omitempty"`
+	Key       []byte `protobuf:"bytes,4,opt,name=key,proto3" json:"key,omitempty"`
+}
+
+func (x *RawKey) Reset() {
+	*x = RawKey{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_v1_keys_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RawKey) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RawKey) ProtoMessage() {}
+
+func (x *RawKey) ProtoReflect() protoreflect.Message {
+	mi := &file_common_v1_keys_proto_msgTypes[2]
+	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)
+}
+
+// Deprecated: Use RawKey.ProtoReflect.Descriptor instead.
+func (*RawKey) Descriptor() ([]byte, []int) {
+	return file_common_v1_keys_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *RawKey) GetAlgorithm() string {
+	if x != nil {
+		return x.Algorithm
+	}
+	return ""
+}
+
+func (x *RawKey) GetEncoding() string {
+	if x != nil {
+		return x.Encoding
+	}
+	return ""
+}
+
+func (x *RawKey) GetCurve() string {
+	if x != nil {
+		return x.Curve
+	}
+	return ""
+}
+
+func (x *RawKey) GetKey() []byte {
+	if x != nil {
+		return x.Key
+	}
+	return nil
+}
+
+var File_common_v1_keys_proto protoreflect.FileDescriptor
+
+var file_common_v1_keys_proto_rawDesc = []byte{
+	0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x65, 0x79, 0x73,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76,
+	0x31, 0x22, 0x8c, 0x01, 0x0a, 0x06, 0x50, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04,
+	0x72, 0x6f, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65,
+	0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x07, 0x72,
+	0x61, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x61, 0x77, 0x4b, 0x65, 0x79, 0x52,
+	0x06, 0x72, 0x61, 0x77, 0x4b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x03, 0x6a, 0x77, 0x6b, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
+	0x2e, 0x4a, 0x53, 0x4f, 0x4e, 0x57, 0x65, 0x62, 0x4b, 0x65, 0x79, 0x52, 0x03, 0x6a, 0x77, 0x6b,
+	0x22, 0x68, 0x0a, 0x0a, 0x4a, 0x53, 0x4f, 0x4e, 0x57, 0x65, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x74, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x63, 0x72, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63,
+	0x72, 0x76, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x78,
+	0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x79, 0x12, 0x0c,
+	0x0a, 0x01, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x6e, 0x12, 0x0c, 0x0a, 0x01,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x65, 0x22, 0x6a, 0x0a, 0x06, 0x52, 0x61,
+	0x77, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68,
+	0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74,
+	0x68, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x14,
+	0x0a, 0x05, 0x63, 0x75, 0x72, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63,
+	0x75, 0x72, 0x76, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72,
+	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x73, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
+}
+
+var (
+	file_common_v1_keys_proto_rawDescOnce sync.Once
+	file_common_v1_keys_proto_rawDescData = file_common_v1_keys_proto_rawDesc
+)
+
+func file_common_v1_keys_proto_rawDescGZIP() []byte {
+	file_common_v1_keys_proto_rawDescOnce.Do(func() {
+		file_common_v1_keys_proto_rawDescData = protoimpl.X.CompressGZIP(file_common_v1_keys_proto_rawDescData)
+	})
+	return file_common_v1_keys_proto_rawDescData
+}
+
+var file_common_v1_keys_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_common_v1_keys_proto_goTypes = []interface{}{
+	(*PubKey)(nil),     // 0: common.v1.PubKey
+	(*JSONWebKey)(nil), // 1: common.v1.JSONWebKey
+	(*RawKey)(nil),     // 2: common.v1.RawKey
+}
+var file_common_v1_keys_proto_depIdxs = []int32{
+	2, // 0: common.v1.PubKey.raw_key:type_name -> common.v1.RawKey
+	1, // 1: common.v1.PubKey.jwk:type_name -> common.v1.JSONWebKey
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_common_v1_keys_proto_init() }
+func file_common_v1_keys_proto_init() {
+	if File_common_v1_keys_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_common_v1_keys_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PubKey); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_v1_keys_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*JSONWebKey); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_v1_keys_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RawKey); 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_common_v1_keys_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_common_v1_keys_proto_goTypes,
+		DependencyIndexes: file_common_v1_keys_proto_depIdxs,
+		MessageInfos:      file_common_v1_keys_proto_msgTypes,
+	}.Build()
+	File_common_v1_keys_proto = out.File
+	file_common_v1_keys_proto_rawDesc = nil
+	file_common_v1_keys_proto_goTypes = nil
+	file_common_v1_keys_proto_depIdxs = nil
+}

pkg/common/types/uri.pb.go

@@ -0,0 +1,215 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: common/v1/uri.proto
+
+package commonv1
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+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)
+)
+
+type URI_URIProtocol int32
+
+const (
+	URI_HTTPS URI_URIProtocol = 0
+	URI_IPFS  URI_URIProtocol = 1
+	URI_IPNS  URI_URIProtocol = 2
+	URI_DID   URI_URIProtocol = 3
+)
+
+// Enum value maps for URI_URIProtocol.
+var (
+	URI_URIProtocol_name = map[int32]string{
+		0: "HTTPS",
+		1: "IPFS",
+		2: "IPNS",
+		3: "DID",
+	}
+	URI_URIProtocol_value = map[string]int32{
+		"HTTPS": 0,
+		"IPFS":  1,
+		"IPNS":  2,
+		"DID":   3,
+	}
+)
+
+func (x URI_URIProtocol) Enum() *URI_URIProtocol {
+	p := new(URI_URIProtocol)
+	*p = x
+	return p
+}
+
+func (x URI_URIProtocol) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (URI_URIProtocol) Descriptor() protoreflect.EnumDescriptor {
+	return file_common_v1_uri_proto_enumTypes[0].Descriptor()
+}
+
+func (URI_URIProtocol) Type() protoreflect.EnumType {
+	return &file_common_v1_uri_proto_enumTypes[0]
+}
+
+func (x URI_URIProtocol) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use URI_URIProtocol.Descriptor instead.
+func (URI_URIProtocol) EnumDescriptor() ([]byte, []int) {
+	return file_common_v1_uri_proto_rawDescGZIP(), []int{0, 0}
+}
+
+type URI struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Protocol URI_URIProtocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=common.v1.URI_URIProtocol" json:"protocol,omitempty"`
+	Value    string          `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+}
+
+func (x *URI) Reset() {
+	*x = URI{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_v1_uri_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *URI) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*URI) ProtoMessage() {}
+
+func (x *URI) ProtoReflect() protoreflect.Message {
+	mi := &file_common_v1_uri_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)
+}
+
+// Deprecated: Use URI.ProtoReflect.Descriptor instead.
+func (*URI) Descriptor() ([]byte, []int) {
+	return file_common_v1_uri_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *URI) GetProtocol() URI_URIProtocol {
+	if x != nil {
+		return x.Protocol
+	}
+	return URI_HTTPS
+}
+
+func (x *URI) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
+var File_common_v1_uri_proto protoreflect.FileDescriptor
+
+var file_common_v1_uri_proto_rawDesc = []byte{
+	0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x72, 0x69, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31,
+	0x22, 0x8a, 0x01, 0x0a, 0x03, 0x55, 0x52, 0x49, 0x12, 0x36, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x52, 0x49, 0x2e, 0x55, 0x52, 0x49, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
+	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x0b, 0x55, 0x52, 0x49, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x48, 0x54, 0x54, 0x50, 0x53, 0x10, 0x00,
+	0x12, 0x08, 0x0a, 0x04, 0x49, 0x50, 0x46, 0x53, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x50,
+	0x4e, 0x53, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x49, 0x44, 0x10, 0x03, 0x42, 0x32, 0x5a,
+	0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f,
+	0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x76,
+	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_common_v1_uri_proto_rawDescOnce sync.Once
+	file_common_v1_uri_proto_rawDescData = file_common_v1_uri_proto_rawDesc
+)
+
+func file_common_v1_uri_proto_rawDescGZIP() []byte {
+	file_common_v1_uri_proto_rawDescOnce.Do(func() {
+		file_common_v1_uri_proto_rawDescData = protoimpl.X.CompressGZIP(file_common_v1_uri_proto_rawDescData)
+	})
+	return file_common_v1_uri_proto_rawDescData
+}
+
+var file_common_v1_uri_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_common_v1_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_common_v1_uri_proto_goTypes = []interface{}{
+	(URI_URIProtocol)(0), // 0: common.v1.URI.URIProtocol
+	(*URI)(nil),          // 1: common.v1.URI
+}
+var file_common_v1_uri_proto_depIdxs = []int32{
+	0, // 0: common.v1.URI.protocol:type_name -> common.v1.URI.URIProtocol
+	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_common_v1_uri_proto_init() }
+func file_common_v1_uri_proto_init() {
+	if File_common_v1_uri_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_common_v1_uri_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*URI); 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_common_v1_uri_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_common_v1_uri_proto_goTypes,
+		DependencyIndexes: file_common_v1_uri_proto_depIdxs,
+		EnumInfos:         file_common_v1_uri_proto_enumTypes,
+		MessageInfos:      file_common_v1_uri_proto_msgTypes,
+	}.Build()
+	File_common_v1_uri_proto = out.File
+	file_common_v1_uri_proto_rawDesc = nil
+	file_common_v1_uri_proto_goTypes = nil
+	file_common_v1_uri_proto_depIdxs = nil
+}

pkg/core/README.md

@@ -0,0 +1 @@
+# Core

pkg/core/appmodule/environment.go

@@ -0,0 +1,30 @@
+package appmodule
+
+import (
+	"cosmossdk.io/core/event"
+	"cosmossdk.io/core/gas"
+	"cosmossdk.io/core/header"
+	"cosmossdk.io/core/store"
+
+	"github.com/onsonr/sonr/pkg/core/branch"
+	"github.com/onsonr/sonr/pkg/core/log"
+	"github.com/onsonr/sonr/pkg/core/router"
+	"github.com/onsonr/sonr/pkg/core/transaction"
+)
+
+// Environment is used to get all services to their respective module.
+// Contract: All fields of environment are always populated by runtime.
+type Environment struct {
+	Logger log.Logger
+
+	BranchService      branch.Service
+	EventService       event.Service
+	GasService         gas.Service
+	HeaderService      header.Service
+	QueryRouterService router.Service
+	MsgRouterService   router.Service
+	TransactionService transaction.Service
+
+	KVStoreService  store.KVStoreService
+	MemStoreService store.MemoryStoreService
+}

pkg/core/branch/branch.go

@@ -0,0 +1,34 @@
+// Package branch contains the core branch service interface.
+package branch
+
+import (
+	"context"
+	"errors"
+)
+
+// ErrGasLimitExceeded is returned when the gas limit is exceeded in a
+// Service.ExecuteWithGasLimit call.
+var ErrGasLimitExceeded = errors.New("branch: gas limit exceeded")
+
+// Service is the branch service interface. It can be used to execute
+// code paths in an isolated execution context that can be reverted.
+// A revert typically means a rollback on events and state changes.
+type Service interface {
+	// Execute executes the given function in an isolated context. If the
+	// `f` function returns an error, the execution is considered failed,
+	// and every change made affecting the execution context is rolled back.
+	// If the function returns nil, the execution is considered successful, and
+	// committed.
+	// The context.Context passed to the `f` function is a child of the context
+	// passed to the Execute function, and is what should be used with other
+	// core services in order to ensure the execution remains isolated.
+	Execute(ctx context.Context, f func(ctx context.Context) error) error
+	// ExecuteWithGasLimit executes the given function `f` in an isolated context,
+	// with the provided gas limit, this is advanced usage and is used to disallow
+	// an execution path to consume an indefinite amount of gas.
+	// If the execution fails or succeeds the gas limit is still applied to the
+	// parent context, the function returns a gasUsed value which is the amount
+	// of gas used by the execution path. If the execution path exceeds the gas
+	// ErrGasLimitExceeded is returned.
+	ExecuteWithGasLimit(ctx context.Context, gasLimit uint64, f func(ctx context.Context) error) (gasUsed uint64, err error)
+}

pkg/core/log/logger.go

@@ -0,0 +1,29 @@
+package log
+
+const ModuleKey = "module"
+
+// Logger defines basic logger functionality that all previous versions of the Logger interface should
+// support. Library users should prefer to use this interface when possible, then type case to Logger
+// to see if WithContext is supported.
+type Logger interface {
+	// Info takes a message and a set of key/value pairs and logs with level INFO.
+	// The key of the tuple must be a string.
+	Info(msg string, keyVals ...any)
+
+	// Warn takes a message and a set of key/value pairs and logs with level WARN.
+	// The key of the tuple must be a string.
+	Warn(msg string, keyVals ...any)
+
+	// Error takes a message and a set of key/value pairs and logs with level ERR.
+	// The key of the tuple must be a string.
+	Error(msg string, keyVals ...any)
+
+	// Debug takes a message and a set of key/value pairs and logs with level DEBUG.
+	// The key of the tuple must be a string.
+	Debug(msg string, keyVals ...any)
+
+	// Impl returns the underlying logger implementation.
+	// It is used to access the full functionalities of the underlying logger.
+	// Advanced users can type cast the returned value to the actual logger.
+	Impl() any
+}

pkg/core/router/service.go

@@ -0,0 +1,16 @@
+package router
+
+import (
+	"context"
+
+	"github.com/onsonr/sonr/pkg/core/transaction"
+)
+
+// Service is the interface that wraps the basic methods for a router.
+// A router can be a query router or a message router.
+type Service interface {
+	// CanInvoke returns an error if the given request cannot be invoked.
+	CanInvoke(ctx context.Context, typeURL string) error
+	// Invoke execute a message or query. The response should be type casted by the caller to the expected response.
+	Invoke(ctx context.Context, req transaction.Msg) (res transaction.Msg, err error)
+}

pkg/core/transaction/service.go

@@ -0,0 +1,25 @@
+package transaction
+
+import "context"
+
+// ExecMode defines the execution mode
+type ExecMode uint8
+
+// All possible execution modes.
+// For backwards compatibility and easier casting, the exec mode values must be the same as in cosmos/cosmos-sdk/types package.
+const (
+	ExecModeCheck ExecMode = iota
+	ExecModeReCheck
+	ExecModeSimulate
+	_
+	_
+	_
+	_
+	ExecModeFinalize
+)
+
+// Service creates a transaction service.
+type Service interface {
+	// ExecMode returns the current execution mode.
+	ExecMode(ctx context.Context) ExecMode
+}

pkg/core/transaction/transaction.go

@@ -0,0 +1,45 @@
+package transaction
+
+type (
+	// Msg uses structural types to define the interface for a message.
+	Msg = interface {
+		Reset()
+		String() string
+		ProtoMessage()
+	}
+	Identity = []byte
+)
+
+// GenericMsg defines a generic version of a Msg.
+// The GenericMsg refers to the non pointer version of Msg,
+// and is required to allow its instantiations in generic contexts.
+type GenericMsg[T any] interface {
+	*T
+	Msg
+}
+
+// Codec defines the TX codec, which converts a TX from bytes to its concrete representation.
+type Codec[T Tx] interface {
+	// Decode decodes the tx bytes into a DecodedTx, containing
+	// both concrete and bytes representation of the tx.
+	Decode([]byte) (T, error)
+	// DecodeJSON decodes the tx JSON bytes into a DecodedTx
+	DecodeJSON([]byte) (T, error)
+}
+
+// Tx defines the interface for a transaction.
+// All custom transactions must implement this interface.
+type Tx interface {
+	// Hash returns the unique identifier for the Tx.
+	Hash() [32]byte
+	// GetMessages returns the list of state transitions of the Tx.
+	GetMessages() ([]Msg, error)
+	// GetSenders returns the tx state transition sender.
+	GetSenders() ([]Identity, error) // TODO reduce this to a single identity if accepted
+	// GetGasLimit returns the gas limit of the tx. Must return math.MaxUint64 for infinite gas
+	// txs.
+	GetGasLimit() (uint64, error)
+	// Bytes returns the encoded version of this tx. Note: this is ideally cached
+	// from the first instance of the decoding of the tx.
+	Bytes() []byte
+}

pkg/hway/README.md

@@ -0,0 +1 @@
+# Hway

pkg/hway/handlers/sync.go

@@ -0,0 +1,13 @@
+package handlers
+
+import "github.com/labstack/echo/v4"
+
+func FetchInitial(e echo.Context) error {
+	// Implement database schema endpoint
+	return nil
+}
+
+func FetchCurrent(e echo.Context) error {
+	// Implement account entries endpoint
+	return nil
+}

pkg/hway/types/api.pb.go

@@ -0,0 +1,535 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: hway/v1/api.proto
+
+package types
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+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)
+)
+
+type GetJWKSRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *GetJWKSRequest) Reset() {
+	*x = GetJWKSRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetJWKSRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetJWKSRequest) ProtoMessage() {}
+
+func (x *GetJWKSRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_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)
+}
+
+// Deprecated: Use GetJWKSRequest.ProtoReflect.Descriptor instead.
+func (*GetJWKSRequest) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{0}
+}
+
+type GetJWKSResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Jwks string `protobuf:"bytes,1,opt,name=jwks,proto3" json:"jwks,omitempty"`
+}
+
+func (x *GetJWKSResponse) Reset() {
+	*x = GetJWKSResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetJWKSResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetJWKSResponse) ProtoMessage() {}
+
+func (x *GetJWKSResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_proto_msgTypes[1]
+	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)
+}
+
+// Deprecated: Use GetJWKSResponse.ProtoReflect.Descriptor instead.
+func (*GetJWKSResponse) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *GetJWKSResponse) GetJwks() string {
+	if x != nil {
+		return x.Jwks
+	}
+	return ""
+}
+
+type GetTokenRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Subject string `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"`
+	Origin  string `protobuf:"bytes,2,opt,name=origin,proto3" json:"origin,omitempty"`
+	Key     string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	Asset   string `protobuf:"bytes,4,opt,name=asset,proto3" json:"asset,omitempty"`
+}
+
+func (x *GetTokenRequest) Reset() {
+	*x = GetTokenRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetTokenRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetTokenRequest) ProtoMessage() {}
+
+func (x *GetTokenRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_proto_msgTypes[2]
+	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)
+}
+
+// Deprecated: Use GetTokenRequest.ProtoReflect.Descriptor instead.
+func (*GetTokenRequest) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GetTokenRequest) GetSubject() string {
+	if x != nil {
+		return x.Subject
+	}
+	return ""
+}
+
+func (x *GetTokenRequest) GetOrigin() string {
+	if x != nil {
+		return x.Origin
+	}
+	return ""
+}
+
+func (x *GetTokenRequest) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *GetTokenRequest) GetAsset() string {
+	if x != nil {
+		return x.Asset
+	}
+	return ""
+}
+
+type GetTokenResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
+}
+
+func (x *GetTokenResponse) Reset() {
+	*x = GetTokenResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetTokenResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetTokenResponse) ProtoMessage() {}
+
+func (x *GetTokenResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_proto_msgTypes[3]
+	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)
+}
+
+// Deprecated: Use GetTokenResponse.ProtoReflect.Descriptor instead.
+func (*GetTokenResponse) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *GetTokenResponse) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+type GrantAuthorizationRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Subject   string `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"`
+	Origin    string `protobuf:"bytes,2,opt,name=origin,proto3" json:"origin,omitempty"`
+	Key       string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
+	Asset     string `protobuf:"bytes,4,opt,name=asset,proto3" json:"asset,omitempty"`
+	Assertion string `protobuf:"bytes,5,opt,name=assertion,proto3" json:"assertion,omitempty"`
+}
+
+func (x *GrantAuthorizationRequest) Reset() {
+	*x = GrantAuthorizationRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GrantAuthorizationRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrantAuthorizationRequest) ProtoMessage() {}
+
+func (x *GrantAuthorizationRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_proto_msgTypes[4]
+	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)
+}
+
+// Deprecated: Use GrantAuthorizationRequest.ProtoReflect.Descriptor instead.
+func (*GrantAuthorizationRequest) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *GrantAuthorizationRequest) GetSubject() string {
+	if x != nil {
+		return x.Subject
+	}
+	return ""
+}
+
+func (x *GrantAuthorizationRequest) GetOrigin() string {
+	if x != nil {
+		return x.Origin
+	}
+	return ""
+}
+
+func (x *GrantAuthorizationRequest) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *GrantAuthorizationRequest) GetAsset() string {
+	if x != nil {
+		return x.Asset
+	}
+	return ""
+}
+
+func (x *GrantAuthorizationRequest) GetAssertion() string {
+	if x != nil {
+		return x.Assertion
+	}
+	return ""
+}
+
+type GrantAuthorizationResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
+}
+
+func (x *GrantAuthorizationResponse) Reset() {
+	*x = GrantAuthorizationResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hway_v1_api_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GrantAuthorizationResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrantAuthorizationResponse) ProtoMessage() {}
+
+func (x *GrantAuthorizationResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_hway_v1_api_proto_msgTypes[5]
+	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)
+}
+
+// Deprecated: Use GrantAuthorizationResponse.ProtoReflect.Descriptor instead.
+func (*GrantAuthorizationResponse) Descriptor() ([]byte, []int) {
+	return file_hway_v1_api_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *GrantAuthorizationResponse) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+var File_hway_v1_api_proto protoreflect.FileDescriptor
+
+var file_hway_v1_api_proto_rawDesc = []byte{
+	0x0a, 0x11, 0x68, 0x77, 0x61, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x07, 0x68, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x22, 0x10, 0x0a, 0x0e,
+	0x47, 0x65, 0x74, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x25,
+	0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x12, 0x0a, 0x04, 0x6a, 0x77, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6a, 0x77, 0x6b, 0x73, 0x22, 0x6b, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65,
+	0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x73, 0x73,
+	0x65, 0x74, 0x22, 0x28, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x93, 0x01, 0x0a,
+	0x19, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75,
+	0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62,
+	0x6a, 0x65, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61,
+	0x73, 0x73, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x69,
+	0x6f, 0x6e, 0x22, 0x32, 0x0a, 0x1a, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f,
+	0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x32, 0xe7, 0x01, 0x0a, 0x07, 0x48, 0x69, 0x67, 0x68, 0x77,
+	0x61, 0x79, 0x12, 0x3c, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4a, 0x57, 0x4b, 0x53, 0x12, 0x17, 0x2e,
+	0x68, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4a, 0x57, 0x4b, 0x53, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x68, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x3f, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x18, 0x2e, 0x68,
+	0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x68, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31,
+	0x2e, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x5d, 0x0a, 0x12, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x68, 0x77, 0x61, 0x79, 0x2e, 0x76,
+	0x31, 0x2e, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x68, 0x77,
+	0x61, 0x79, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f,
+	0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x42, 0x27, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f,
+	0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x68,
+	0x77, 0x61, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
+}
+
+var (
+	file_hway_v1_api_proto_rawDescOnce sync.Once
+	file_hway_v1_api_proto_rawDescData = file_hway_v1_api_proto_rawDesc
+)
+
+func file_hway_v1_api_proto_rawDescGZIP() []byte {
+	file_hway_v1_api_proto_rawDescOnce.Do(func() {
+		file_hway_v1_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_hway_v1_api_proto_rawDescData)
+	})
+	return file_hway_v1_api_proto_rawDescData
+}
+
+var file_hway_v1_api_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_hway_v1_api_proto_goTypes = []interface{}{
+	(*GetJWKSRequest)(nil),             // 0: hway.v1.GetJWKSRequest
+	(*GetJWKSResponse)(nil),            // 1: hway.v1.GetJWKSResponse
+	(*GetTokenRequest)(nil),            // 2: hway.v1.GetTokenRequest
+	(*GetTokenResponse)(nil),           // 3: hway.v1.GetTokenResponse
+	(*GrantAuthorizationRequest)(nil),  // 4: hway.v1.GrantAuthorizationRequest
+	(*GrantAuthorizationResponse)(nil), // 5: hway.v1.GrantAuthorizationResponse
+}
+var file_hway_v1_api_proto_depIdxs = []int32{
+	0, // 0: hway.v1.Highway.GetJWKS:input_type -> hway.v1.GetJWKSRequest
+	2, // 1: hway.v1.Highway.GetToken:input_type -> hway.v1.GetTokenRequest
+	4, // 2: hway.v1.Highway.GrantAuthorization:input_type -> hway.v1.GrantAuthorizationRequest
+	1, // 3: hway.v1.Highway.GetJWKS:output_type -> hway.v1.GetJWKSResponse
+	3, // 4: hway.v1.Highway.GetToken:output_type -> hway.v1.GetTokenResponse
+	5, // 5: hway.v1.Highway.GrantAuthorization:output_type -> hway.v1.GrantAuthorizationResponse
+	3, // [3:6] is the sub-list for method output_type
+	0, // [0:3] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_hway_v1_api_proto_init() }
+func file_hway_v1_api_proto_init() {
+	if File_hway_v1_api_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_hway_v1_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetJWKSRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hway_v1_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetJWKSResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hway_v1_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetTokenRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hway_v1_api_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetTokenResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hway_v1_api_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GrantAuthorizationRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hway_v1_api_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GrantAuthorizationResponse); 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_hway_v1_api_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   6,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_hway_v1_api_proto_goTypes,
+		DependencyIndexes: file_hway_v1_api_proto_depIdxs,
+		MessageInfos:      file_hway_v1_api_proto_msgTypes,
+	}.Build()
+	File_hway_v1_api_proto = out.File
+	file_hway_v1_api_proto_rawDesc = nil
+	file_hway_v1_api_proto_goTypes = nil
+	file_hway_v1_api_proto_depIdxs = nil
+}

pkg/hway/types/client.pb.go

@@ -0,0 +1,63 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: hway/v1/client.proto
+
+package types
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+)
+
+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)
+)
+
+var File_hway_v1_client_proto protoreflect.FileDescriptor
+
+var file_hway_v1_client_proto_rawDesc = []byte{
+	0x0a, 0x14, 0x68, 0x77, 0x61, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x68, 0x77, 0x61, 0x79, 0x2e, 0x76, 0x31, 0x42,
+	0x27, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e,
+	0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x68, 0x77,
+	0x61, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73,
+}
+
+var file_hway_v1_client_proto_goTypes = []interface{}{}
+var file_hway_v1_client_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_hway_v1_client_proto_init() }
+func file_hway_v1_client_proto_init() {
+	if File_hway_v1_client_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_hway_v1_client_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   0,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_hway_v1_client_proto_goTypes,
+		DependencyIndexes: file_hway_v1_client_proto_depIdxs,
+	}.Build()
+	File_hway_v1_client_proto = out.File
+	file_hway_v1_client_proto_rawDesc = nil
+	file_hway_v1_client_proto_goTypes = nil
+	file_hway_v1_client_proto_depIdxs = nil
+}

pkg/motr/README.md

@@ -0,0 +1 @@
+# Motr

pkg/motr/config/Config.pkl.go

@@ -1,5 +1,5 @@
-// Code generated from Pkl module `dwngen`. DO NOT EDIT.
+// Code generated from Pkl module `dwn`. DO NOT EDIT.
-package gen
+package config
 
 type Config struct {
 	IpfsGatewayUrl string `pkl:"ipfsGatewayUrl" json:"ipfsGatewayUrl,omitempty"`

pkg/motr/config/Dwn.pkl.go

@@ -1,5 +1,5 @@
-// Code generated from Pkl module `dwngen`. DO NOT EDIT.
+// Code generated from Pkl module `dwn`. DO NOT EDIT.
-package gen
+package config
 
 import (
 	"context"
@@ -7,11 +7,11 @@ import (
 	"github.com/apple/pkl-go/pkl"
 )
 
-type Dwngen struct {
+type Dwn struct {
 }
 
-// LoadFromPath loads the pkl module at the given path and evaluates it into a Dwngen
+// LoadFromPath loads the pkl module at the given path and evaluates it into a Dwn
-func LoadFromPath(ctx context.Context, path string) (ret *Dwngen, err error) {
+func LoadFromPath(ctx context.Context, path string) (ret *Dwn, err error) {
 	evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions)
 	if err != nil {
 		return nil, err
@@ -26,9 +26,9 @@ func LoadFromPath(ctx context.Context, path string) (ret *Dwngen, err error) {
 	return ret, err
 }
 
-// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Dwngen
+// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Dwn
-func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Dwngen, error) {
+func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Dwn, error) {
-	var ret Dwngen
+	var ret Dwn
 	if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil {
 		return nil, err
 	}

pkg/motr/config/Schema.pkl.go

@@ -1,5 +1,5 @@
-// Code generated from Pkl module `dwngen`. DO NOT EDIT.
+// Code generated from Pkl module `dwn`. DO NOT EDIT.
-package gen
+package config
 
 type Schema struct {
 	Version int `pkl:"version"`

pkg/motr/config/init.pkl.go

@@ -0,0 +1,10 @@
+// Code generated from Pkl module `dwn`. DO NOT EDIT.
+package config
+
+import "github.com/apple/pkl-go/pkl"
+
+func init() {
+	pkl.RegisterMapping("dwn", Dwn{})
+	pkl.RegisterMapping("dwn#Config", Config{})
+	pkl.RegisterMapping("dwn#Schema", Schema{})
+}

pkg/motr/embed.go

@@ -1,30 +1,27 @@
-package dwn
+package motr
 
 import (
 	_ "embed"
 	"encoding/json"
 
 	"github.com/ipfs/boxo/files"
-	"github.com/onsonr/sonr/internal/dwn/gen"
+
-	"github.com/onsonr/sonr/pkg/nebula"
+	"github.com/onsonr/sonr/pkg/motr/config"
+	"github.com/onsonr/sonr/pkg/motr/static"
 )
 
 const (
-	FileNameAppWASM    = "app.wasm"
+	FileNameConfigJSON = "dwn.pkl"
-	FileNameConfigJSON = "dwn.json"
 	FileNameIndexHTML  = "index.html"
 	FileNameWorkerJS   = "sw.js"
 )
 
-//go:embed app.wasm
+//go:embed static/sw.js
-var dwnWasmData []byte
-
-//go:embed sw.js
 var swJSData []byte
 
 // NewVaultDirectory creates a new directory with the default files
-func NewVaultDirectory(cnfg *gen.Config) (files.Node, error) {
+func NewVaultDirectory(cnfg *config.Config) (files.Node, error) {
-	idxFile, err := nebula.BuildVaultFile(cnfg)
+	idxFile, err := static.BuildVaultFile(cnfg)
 	if err != nil {
 		return nil, err
 	}
@@ -33,7 +30,6 @@ func NewVaultDirectory(cnfg *gen.Config) (files.Node, error) {
 		return nil, err
 	}
 	fileMap := map[string]files.Node{
-		FileNameAppWASM:    files.NewBytesFile(dwnWasmData),
 		FileNameConfigJSON: files.NewBytesFile(cnfgBz),
 		FileNameIndexHTML:  idxFile,
 		FileNameWorkerJS:   files.NewBytesFile(swJSData),

pkg/motr/handlers/auth.go

@@ -4,24 +4,20 @@ import (
 	"github.com/go-webauthn/webauthn/protocol"
 	"github.com/labstack/echo/v4"
 
-	"github.com/onsonr/sonr/internal/orm"
+	"github.com/onsonr/sonr/pkg/motr/types/orm"
 )
 
-type authAPI struct{}
-
-var Auth = new(authAPI)
-
 // ╭───────────────────────────────────────────────────────────╮
 // │                    Login Handlers                         │
 // ╰───────────────────────────────────────────────────────────╯
 
 // LoginSubjectCheck handles the login subject check.
-func (a *authAPI) LoginSubjectCheck(e echo.Context) error {
+func LoginSubjectCheck(e echo.Context) error {
 	return e.JSON(200, "HandleCredentialAssertion")
 }
 
 // LoginSubjectStart handles the login subject start.
-func (a *authAPI) LoginSubjectStart(e echo.Context) error {
+func LoginSubjectStart(e echo.Context) error {
 	opts := &protocol.PublicKeyCredentialRequestOptions{
 		UserVerification: "preferred",
 		Challenge:        []byte("challenge"),
@@ -30,7 +26,7 @@ func (a *authAPI) LoginSubjectStart(e echo.Context) error {
 }
 
 // LoginSubjectFinish handles the login subject finish.
-func (a *authAPI) LoginSubjectFinish(e echo.Context) error {
+func LoginSubjectFinish(e echo.Context) error {
 	var crr protocol.CredentialAssertionResponse
 	if err := e.Bind(&crr); err != nil {
 		return err
@@ -43,13 +39,13 @@ func (a *authAPI) LoginSubjectFinish(e echo.Context) error {
 // ╰───────────────────────────────────────────────────────────╯
 
 // RegisterSubjectCheck handles the register subject check.
-func (a *authAPI) RegisterSubjectCheck(e echo.Context) error {
+func RegisterSubjectCheck(e echo.Context) error {
 	subject := e.FormValue("subject")
 	return e.JSON(200, subject)
 }
 
 // RegisterSubjectStart handles the register subject start.
-func (a *authAPI) RegisterSubjectStart(e echo.Context) error {
+func RegisterSubjectStart(e echo.Context) error {
 	// Get subject and address
 	subject := e.FormValue("subject")
 	address := e.FormValue("address")
@@ -63,7 +59,7 @@ func (a *authAPI) RegisterSubjectStart(e echo.Context) error {
 }
 
 // RegisterSubjectFinish handles the register subject finish.
-func (a *authAPI) RegisterSubjectFinish(e echo.Context) error {
+func RegisterSubjectFinish(e echo.Context) error {
 	// Deserialize the JSON into a temporary struct
 	var ccr protocol.CredentialCreationResponse
 	if err := e.Bind(&ccr); err != nil {

pkg/motr/handlers/openid.go

@@ -0,0 +1,23 @@
+package handlers
+
+import (
+	"github.com/labstack/echo/v4"
+)
+
+func GrantAuthorization(e echo.Context) error {
+	// Implement authorization endpoint using passkey authentication
+	// Store session data in cache
+	return nil
+}
+
+func GetJWKS(e echo.Context) error {
+	// Implement token endpoint
+	// Use cached session data for validation
+	return nil
+}
+
+func GetToken(e echo.Context) error {
+	// Implement token endpoint
+	// Use cached session data for validation
+	return nil
+}

pkg/motr/routes/routes.go

@@ -0,0 +1,26 @@
+package routes
+
+import (
+	"github.com/labstack/echo/v4"
+
+	"github.com/onsonr/sonr/pkg/motr/handlers"
+)
+
+// RegisterWebNodeAPI registers the Decentralized Web Node API routes.
+func RegisterWebNodeAPI(e *echo.Echo) {
+	g1 := e.Group("api")
+	g1.GET("/register/:subject/start", handlers.RegisterSubjectStart)
+	g1.POST("/register/:subject/check", handlers.RegisterSubjectCheck)
+	g1.POST("/register/:subject/finish", handlers.RegisterSubjectFinish)
+
+	g1.GET("/login/:subject/start", handlers.LoginSubjectStart)
+	g1.POST("/login/:subject/check", handlers.LoginSubjectCheck)
+	g1.POST("/login/:subject/finish", handlers.LoginSubjectFinish)
+
+	g1.GET("/:origin/grant/jwks", handlers.GetJWKS)
+	g1.GET("/:origin/grant/token", handlers.GetToken)
+	g1.POST("/:origin/grant/:subject", handlers.GrantAuthorization)
+}
+
+func RegisterWebNodeViews(e *echo.Echo) {
+}

pkg/motr/static/index.go

@@ -1,16 +1,17 @@
-package nebula
+package static
 
 import (
 	"bytes"
 	"context"
 
 	"github.com/ipfs/boxo/files"
-	"github.com/onsonr/sonr/internal/dwn/gen"
+
+	dwn "github.com/onsonr/sonr/pkg/motr/config"
 	"github.com/onsonr/sonr/pkg/nebula/views"
 )
 
 // BuildVaultFile builds the index.html file for the vault
-func BuildVaultFile(cnfg *gen.Config) (files.Node, error) {
+func BuildVaultFile(cnfg *dwn.Config) (files.Node, error) {
 	w := bytes.NewBuffer(nil)
 	err := views.VaultIndexFile().Render(context.Background(), w)
 	if err != nil {

pkg/motr/types/api.pb.go

@@ -0,0 +1,342 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: motr/v1/api.proto
+
+package types
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+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)
+)
+
+type PinRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"`
+}
+
+func (x *PinRequest) Reset() {
+	*x = PinRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_motr_v1_api_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PinRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PinRequest) ProtoMessage() {}
+
+func (x *PinRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_motr_v1_api_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)
+}
+
+// Deprecated: Use PinRequest.ProtoReflect.Descriptor instead.
+func (*PinRequest) Descriptor() ([]byte, []int) {
+	return file_motr_v1_api_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *PinRequest) GetCid() string {
+	if x != nil {
+		return x.Cid
+	}
+	return ""
+}
+
+type PinResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+}
+
+func (x *PinResponse) Reset() {
+	*x = PinResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_motr_v1_api_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PinResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PinResponse) ProtoMessage() {}
+
+func (x *PinResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_motr_v1_api_proto_msgTypes[1]
+	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)
+}
+
+// Deprecated: Use PinResponse.ProtoReflect.Descriptor instead.
+func (*PinResponse) Descriptor() ([]byte, []int) {
+	return file_motr_v1_api_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *PinResponse) GetSuccess() bool {
+	if x != nil {
+		return x.Success
+	}
+	return false
+}
+
+type UnpinRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"`
+}
+
+func (x *UnpinRequest) Reset() {
+	*x = UnpinRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_motr_v1_api_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UnpinRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UnpinRequest) ProtoMessage() {}
+
+func (x *UnpinRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_motr_v1_api_proto_msgTypes[2]
+	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)
+}
+
+// Deprecated: Use UnpinRequest.ProtoReflect.Descriptor instead.
+func (*UnpinRequest) Descriptor() ([]byte, []int) {
+	return file_motr_v1_api_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *UnpinRequest) GetCid() string {
+	if x != nil {
+		return x.Cid
+	}
+	return ""
+}
+
+type UnpinResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+}
+
+func (x *UnpinResponse) Reset() {
+	*x = UnpinResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_motr_v1_api_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UnpinResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UnpinResponse) ProtoMessage() {}
+
+func (x *UnpinResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_motr_v1_api_proto_msgTypes[3]
+	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)
+}
+
+// Deprecated: Use UnpinResponse.ProtoReflect.Descriptor instead.
+func (*UnpinResponse) Descriptor() ([]byte, []int) {
+	return file_motr_v1_api_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *UnpinResponse) GetSuccess() bool {
+	if x != nil {
+		return x.Success
+	}
+	return false
+}
+
+var File_motr_v1_api_proto protoreflect.FileDescriptor
+
+var file_motr_v1_api_proto_rawDesc = []byte{
+	0x0a, 0x11, 0x6d, 0x6f, 0x74, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x6f, 0x74, 0x72, 0x2e, 0x76, 0x31, 0x22, 0x1e, 0x0a, 0x0a,
+	0x50, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x0b,
+	0x50, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73,
+	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x20, 0x0a, 0x0c, 0x55, 0x6e, 0x70, 0x69, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x29, 0x0a, 0x0d, 0x55, 0x6e, 0x70, 0x69, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x32, 0x70, 0x0a, 0x04, 0x4d, 0x6f, 0x74, 0x72, 0x12, 0x30, 0x0a, 0x03, 0x50, 0x69,
+	0x6e, 0x12, 0x13, 0x2e, 0x6d, 0x6f, 0x74, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x6d, 0x6f, 0x74, 0x72, 0x2e, 0x76, 0x31,
+	0x2e, 0x50, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x05,
+	0x55, 0x6e, 0x70, 0x69, 0x6e, 0x12, 0x15, 0x2e, 0x6d, 0x6f, 0x74, 0x72, 0x2e, 0x76, 0x31, 0x2e,
+	0x55, 0x6e, 0x70, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x6d,
+	0x6f, 0x74, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x70, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x42, 0x27, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x70,
+	0x6b, 0x67, 0x2f, 0x6d, 0x6f, 0x74, 0x72, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_motr_v1_api_proto_rawDescOnce sync.Once
+	file_motr_v1_api_proto_rawDescData = file_motr_v1_api_proto_rawDesc
+)
+
+func file_motr_v1_api_proto_rawDescGZIP() []byte {
+	file_motr_v1_api_proto_rawDescOnce.Do(func() {
+		file_motr_v1_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_motr_v1_api_proto_rawDescData)
+	})
+	return file_motr_v1_api_proto_rawDescData
+}
+
+var file_motr_v1_api_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_motr_v1_api_proto_goTypes = []interface{}{
+	(*PinRequest)(nil),    // 0: motr.v1.PinRequest
+	(*PinResponse)(nil),   // 1: motr.v1.PinResponse
+	(*UnpinRequest)(nil),  // 2: motr.v1.UnpinRequest
+	(*UnpinResponse)(nil), // 3: motr.v1.UnpinResponse
+}
+var file_motr_v1_api_proto_depIdxs = []int32{
+	0, // 0: motr.v1.Motr.Pin:input_type -> motr.v1.PinRequest
+	2, // 1: motr.v1.Motr.Unpin:input_type -> motr.v1.UnpinRequest
+	1, // 2: motr.v1.Motr.Pin:output_type -> motr.v1.PinResponse
+	3, // 3: motr.v1.Motr.Unpin:output_type -> motr.v1.UnpinResponse
+	2, // [2:4] is the sub-list for method output_type
+	0, // [0:2] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_motr_v1_api_proto_init() }
+func file_motr_v1_api_proto_init() {
+	if File_motr_v1_api_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_motr_v1_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PinRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_motr_v1_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PinResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_motr_v1_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnpinRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_motr_v1_api_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnpinResponse); 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_motr_v1_api_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_motr_v1_api_proto_goTypes,
+		DependencyIndexes: file_motr_v1_api_proto_depIdxs,
+		MessageInfos:      file_motr_v1_api_proto_msgTypes,
+	}.Build()
+	File_motr_v1_api_proto = out.File
+	file_motr_v1_api_proto_rawDesc = nil
+	file_motr_v1_api_proto_goTypes = nil
+	file_motr_v1_api_proto_depIdxs = nil
+}

pkg/motr/types/orm/DID.pkl.go

@@ -2,11 +2,11 @@
 package orm
 
 import (
-	"github.com/onsonr/sonr/internal/orm/keyalgorithm"
+	"github.com/onsonr/sonr/pkg/motr/types/orm/keyalgorithm"
-	"github.com/onsonr/sonr/internal/orm/keycurve"
+	"github.com/onsonr/sonr/pkg/motr/types/orm/keycurve"
-	"github.com/onsonr/sonr/internal/orm/keyencoding"
+	"github.com/onsonr/sonr/pkg/motr/types/orm/keyencoding"
-	"github.com/onsonr/sonr/internal/orm/keyrole"
+	"github.com/onsonr/sonr/pkg/motr/types/orm/keyrole"
-	"github.com/onsonr/sonr/internal/orm/keytype"
+	"github.com/onsonr/sonr/pkg/motr/types/orm/keytype"
 )
 
 type DID struct {