@@ -16,26 +16,48 @@ templ RegisterModal() {
}
}
-// RedirectModal returns the Modal with a QR code to scan.
-templ RedirectModal() {
- @ui.FullScreenModal() {
-
-
-
-
Continue with your phone
-
Creating a Sonr Vault requires a smartphone with W3C compliant biometrics enabled.
-
-
-
-
Already have an account? Login here
-
By continuing, you agree to our Terms and Policy.
+templ RegisterCredentialForm() {
+
+}
+
+templ NavigatorCredentialsCreate(c echo.Context) {
+
}
diff --git a/pkg/webapp/components/auth/register_start.templ b/pkg/webapp/components/auth/register_start.templ
deleted file mode 100644
index 08ead730c..000000000
--- a/pkg/webapp/components/auth/register_start.templ
+++ /dev/null
@@ -1,53 +0,0 @@
-package auth
-
-templ BasicDetailsForm() {
-
-
- @roleSelectInput()
-
-
-}
-
-templ roleSelectInput() {
-
-
-
-
-
-}
-
-templ nameInput() {
-
-}
-
-templ usernameInput() {
-
-}
diff --git a/pkg/webapp/components/auth/register_start_templ.go b/pkg/webapp/components/auth/register_start_templ.go
deleted file mode 100644
index 35ee1d9f5..000000000
--- a/pkg/webapp/components/auth/register_start_templ.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.793
-package auth
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-func BasicDetailsForm() templ.Component {
- return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var1 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var1 == nil {
- templ_7745c5c3_Var1 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- templ_7745c5c3_Err = roleSelectInput().Render(ctx, templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- return templ_7745c5c3_Err
- })
-}
-
-func roleSelectInput() templ.Component {
- return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var2 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var2 == nil {
- templ_7745c5c3_Var2 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- return templ_7745c5c3_Err
- })
-}
-
-func nameInput() templ.Component {
- return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var3 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var3 == nil {
- templ_7745c5c3_Var3 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- return templ_7745c5c3_Err
- })
-}
-
-func usernameInput() templ.Component {
- return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var4 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var4 == nil {
- templ_7745c5c3_Var4 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- return templ_7745c5c3_Err
- })
-}
-
-var _ = templruntime.GeneratedTemplate
diff --git a/pkg/webapp/components/auth/register_templ.go b/pkg/webapp/components/auth/register_templ.go
index 231cc7bcf..89cd4607c 100644
--- a/pkg/webapp/components/auth/register_templ.go
+++ b/pkg/webapp/components/auth/register_templ.go
@@ -9,6 +9,7 @@ import "github.com/a-h/templ"
import templruntime "github.com/a-h/templ/runtime"
import (
+ "github.com/labstack/echo/v4"
"github.com/onsonr/sonr/pkg/common/middleware/session"
"github.com/onsonr/sonr/pkg/webapp/components/ui"
)
@@ -47,11 +48,7 @@ func RegisterModal() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Err = BasicDetailsForm().Render(ctx, templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -65,8 +62,7 @@ func RegisterModal() templ.Component {
})
}
-// RedirectModal returns the Modal with a QR code to scan.
-func RedirectModal() templ.Component {
+func RegisterCredentialForm() templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -87,33 +83,36 @@ func RedirectModal() templ.Component {
templ_7745c5c3_Var3 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Continue with your phone
Creating a Sonr Vault requires a smartphone with W3C compliant biometrics enabled.
Already have an account? Login here
By continuing, you agree to our Terms and Policy.
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
- })
- templ_7745c5c3_Err = ui.FullScreenModal().Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func NavigatorCredentialsCreate(c echo.Context) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var4 == nil {
+ templ_7745c5c3_Var4 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/pkg/webapp/components/dash/layout.templ b/pkg/webapp/components/dash/layout.templ
new file mode 100644
index 000000000..fa07135a8
--- /dev/null
+++ b/pkg/webapp/components/dash/layout.templ
@@ -0,0 +1,17 @@
+package ui
+
+// Variant is a component that has attributes
+type Variant interface {
+ Attributes() templ.Attributes
+}
+
+// â•â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â•®
+// │ General Layout Components │
+// ╰───────────────────────────────────────────────────────────╯
+
+// Columns is a component that renders a flex container with a gap of 3 and a max width of 100%
+templ Columns() {
+
+ { children... }
+
+}
diff --git a/pkg/webapp/components/dash/layout_templ.go b/pkg/webapp/components/dash/layout_templ.go
new file mode 100644
index 000000000..addc76889
--- /dev/null
+++ b/pkg/webapp/components/dash/layout_templ.go
@@ -0,0 +1,58 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package ui
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+// Variant is a component that has attributes
+type Variant interface {
+ Attributes() templ.Attributes
+}
+
+// â•â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â•®
+// │ General Layout Components │
+// ╰───────────────────────────────────────────────────────────╯
+
+// Columns is a component that renders a flex container with a gap of 3 and a max width of 100%
+func Columns() templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/pkg/webapp/components/landing/highlights.templ b/pkg/webapp/components/landing/highlights.templ
index 841a52b87..6b1436c6f 100644
--- a/pkg/webapp/components/landing/highlights.templ
+++ b/pkg/webapp/components/landing/highlights.templ
@@ -15,24 +15,44 @@ var highlights = &models.Highlights{
Subtitle: "Sonr is a comprehensive system for Identity Management which proteects users across their digital personas while providing Developers a cost-effective solution for decentralized authentication.",
Features: []*models.Feature{
{
- Title: "∞ Factor Auth",
+ Title: "Crypto Wallet",
Desc: "Sonr is designed to work across all platforms and devices, building a encrypted and anonymous identity layer for each user on the internet.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Control Your Data",
+ Title: "PassKey Authenticator",
Desc: "Sonr leverages advanced cryptography to permit facilitating Wallet Operations directly on-chain, without the need for a centralized server.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Crypto Enabled",
+ Title: "Anonymous Identity",
Desc: "Sonr follows the latest specifications from W3C, DIF, and ICF to essentially have an Interchain-Connected, Smart Account System - seamlessly authenticated with PassKeys.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Works Everywhere",
+ Title: "Tokenized Authorization",
Desc: "Sonr anonymously associates your online identities with a Quantum-Resistant Vault which only you can access.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
},
}
diff --git a/pkg/webapp/components/landing/highlights_templ.go b/pkg/webapp/components/landing/highlights_templ.go
index 753f3be5f..242587cc9 100644
--- a/pkg/webapp/components/landing/highlights_templ.go
+++ b/pkg/webapp/components/landing/highlights_templ.go
@@ -23,24 +23,44 @@ var highlights = &models.Highlights{
Subtitle: "Sonr is a comprehensive system for Identity Management which proteects users across their digital personas while providing Developers a cost-effective solution for decentralized authentication.",
Features: []*models.Feature{
{
- Title: "∞ Factor Auth",
+ Title: "Crypto Wallet",
Desc: "Sonr is designed to work across all platforms and devices, building a encrypted and anonymous identity layer for each user on the internet.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Control Your Data",
+ Title: "PassKey Authenticator",
Desc: "Sonr leverages advanced cryptography to permit facilitating Wallet Operations directly on-chain, without the need for a centralized server.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Crypto Enabled",
+ Title: "Anonymous Identity",
Desc: "Sonr follows the latest specifications from W3C, DIF, and ICF to essentially have an Interchain-Connected, Smart Account System - seamlessly authenticated with PassKeys.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
{
- Title: "Works Everywhere",
+ Title: "Tokenized Authorization",
Desc: "Sonr anonymously associates your online identities with a Quantum-Resistant Vault which only you can access.",
Icon: nil,
+ Image: &models.Image{
+ Src: "",
+ Width: "44",
+ Height: "44",
+ },
},
},
}
@@ -76,7 +96,7 @@ func Highlights() templ.Component {
var templ_7745c5c3_Var2 string
templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(highlights.Heading)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 52, Col: 26}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 72, Col: 26}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
if templ_7745c5c3_Err != nil {
@@ -89,7 +109,7 @@ func Highlights() templ.Component {
var templ_7745c5c3_Var3 string
templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(highlights.Subtitle)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 55, Col: 27}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 75, Col: 27}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
if templ_7745c5c3_Err != nil {
@@ -151,7 +171,7 @@ func highlightTab(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var5 string
templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(getSelectedClass(index))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 74, Col: 34}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 94, Col: 34}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
if templ_7745c5c3_Err != nil {
@@ -164,7 +184,7 @@ func highlightTab(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var6 string
templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(getClickPrevent(index))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 76, Col: 41}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 96, Col: 41}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
if templ_7745c5c3_Err != nil {
@@ -177,7 +197,7 @@ func highlightTab(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var7 string
templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Title)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 80, Col: 21}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 100, Col: 21}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
if templ_7745c5c3_Err != nil {
@@ -190,7 +210,7 @@ func highlightTab(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var8 string
templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(getShowBorder(index))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 83, Col: 33}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 103, Col: 33}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
if templ_7745c5c3_Err != nil {
@@ -203,7 +223,7 @@ func highlightTab(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var9 string
templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Desc)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 95, Col: 19}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 115, Col: 19}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
if templ_7745c5c3_Err != nil {
@@ -245,7 +265,7 @@ func highlightCard(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var11 string
templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(getXShow(index))
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 103, Col: 26}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 123, Col: 26}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
if templ_7745c5c3_Err != nil {
@@ -258,7 +278,7 @@ func highlightCard(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var12 string
templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Image.Src)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 114, Col: 29}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 134, Col: 29}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
if templ_7745c5c3_Err != nil {
@@ -271,7 +291,7 @@ func highlightCard(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var13 string
templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Image.Width)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 115, Col: 33}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 135, Col: 33}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
if templ_7745c5c3_Err != nil {
@@ -284,7 +304,7 @@ func highlightCard(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var14 string
templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Image.Height)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 116, Col: 35}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 136, Col: 35}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
if templ_7745c5c3_Err != nil {
@@ -297,7 +317,7 @@ func highlightCard(index int, highlight *models.Feature) templ.Component {
var templ_7745c5c3_Var15 string
templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(highlight.Title)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 117, Col: 25}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/webapp/components/landing/highlights.templ`, Line: 137, Col: 25}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
if templ_7745c5c3_Err != nil {
diff --git a/proto/did/v1/state.proto b/proto/did/v1/state.proto
index 3d4576380..b6283e124 100644
--- a/proto/did/v1/state.proto
+++ b/proto/did/v1/state.proto
@@ -7,7 +7,7 @@ import "did/v1/genesis.proto";
option go_package = "github.com/onsonr/sonr/x/did/types";
-message Assertion {
+message Account {
option (cosmos.orm.v1.table) = {
id: 1
primary_key: {fields: "did"}
@@ -40,66 +40,10 @@ message Assertion {
int64 creation_block = 7;
}
-message Authentication {
+// PublicKey represents a public key
+message PublicKey {
option (cosmos.orm.v1.table) = {
id: 2
- primary_key: {fields: "did"}
- index: {
- id: 1
- fields: "controller,subject"
- unique: true
- }
- };
-
- // The unique identifier of the authentication
- string did = 1;
-
- // The authentication of the DID
- string controller = 2;
-
- // Origin of the authentication
- string subject = 3;
-
- // string is the verification method
- string public_key_hex = 4;
-
- // CredentialID is the byte representation of the credential ID
- bytes credential_id = 5;
-
- // Metadata of the authentication
- map
metadata = 6;
-
- // CreationBlock is the block number of the creation of the authentication
- int64 creation_block = 7;
-}
-
-// Macaroon is a Macaroon message type.
-message Biscuit {
- option (cosmos.orm.v1.table) = {
- id: 5
- primary_key: {
- fields: "id"
- auto_increment: true
- }
- index: {
- id: 1
- fields: "subject,origin"
- unique: true
- }
- };
-
- uint64 id = 1;
- string controller = 2;
- string subject = 3;
- string origin = 4;
- int64 expiry_height = 5;
- string macaroon = 6;
-}
-
-// Controller represents a Sonr DWN Vault
-message Controller {
- option (cosmos.orm.v1.table) = {
- id: 3
primary_key: {
fields: "number"
auto_increment: true
@@ -157,7 +101,7 @@ message Controller {
// Verification represents a verification method
message Verification {
option (cosmos.orm.v1.table) = {
- id: 6
+ id: 3
primary_key: {fields: "did"}
index: {
id: 1
diff --git a/proto/dwn/v1/state.proto b/proto/dwn/v1/state.proto
index fa5ba9440..625ab05cf 100644
--- a/proto/dwn/v1/state.proto
+++ b/proto/dwn/v1/state.proto
@@ -7,7 +7,7 @@ option go_package = "github.com/onsonr/sonr/x/dwn/types";
// https://github.com/cosmos/cosmos-sdk/blob/main/orm/README.md
-message ExampleData {
+message Credential {
option (cosmos.orm.v1.table) = {
id: 1;
primary_key: { fields: "account" }
@@ -16,4 +16,15 @@ message ExampleData {
bytes account = 1;
uint64 amount = 2;
-}
\ No newline at end of file
+}
+
+message Profile {
+ option (cosmos.orm.v1.table) = {
+ id: 2;
+ primary_key: { fields: "account" }
+ index: { id: 1 fields: "amount" }
+ };
+
+ bytes account = 1;
+ uint64 amount = 2;
+}
diff --git a/proto/svc/v1/state.proto b/proto/svc/v1/state.proto
index d1067bba4..890b1aa04 100644
--- a/proto/svc/v1/state.proto
+++ b/proto/svc/v1/state.proto
@@ -8,7 +8,7 @@ option go_package = "github.com/onsonr/sonr/x/svc/types";
// https://github.com/cosmos/cosmos-sdk/blob/main/orm/README.md
-message Metadata {
+message Domain {
option (cosmos.orm.v1.table) = {
id: 1
primary_key: {
@@ -31,8 +31,8 @@ message Metadata {
repeated string tags = 7;
}
-// Profile represents a DID alias
-message Profile {
+// Metadata represents a DID alias
+message Metadata {
option (cosmos.orm.v1.table) = {
id: 2
primary_key: {fields: "id"}
diff --git a/x/did/controller/table.go b/x/did/controller/table.go
index 62ae0cfe6..1d6b00eb1 100644
--- a/x/did/controller/table.go
+++ b/x/did/controller/table.go
@@ -1,20 +1,13 @@
package controller
-import (
- sdk "github.com/cosmos/cosmos-sdk/types"
- "github.com/ethereum/go-ethereum/common/hexutil"
-
- didv1 "github.com/onsonr/sonr/api/did/v1"
-)
-
-func LoadFromTableEntry(ctx sdk.Context, entry *didv1.Controller) (ControllerI, error) {
- k, err := hexutil.Decode(entry.PublicKeyHex)
- if err != nil {
- return nil, err
- }
- return &controller{
- address: entry.Did,
- chainID: ctx.ChainID(),
- publicKey: k,
- }, nil
-}
+// func LoadFromTableEntry(ctx sdk.Context, entry *didv1.Controller) (ControllerI, error) {
+// k, err := hexutil.Decode(entry.PublicKeyHex)
+// if err != nil {
+// return nil, err
+// }
+// return &controller{
+// address: entry.Did,
+// chainID: ctx.ChainID(),
+// publicKey: k,
+// }, nil
+// }
diff --git a/x/did/keeper/genesis.go b/x/did/keeper/genesis.go
index e9e79e727..77b7c3bbf 100644
--- a/x/did/keeper/genesis.go
+++ b/x/did/keeper/genesis.go
@@ -23,18 +23,18 @@ func (k Keeper) NewController(ctx sdk.Context) (controller.ControllerI, error) {
return controller, nil
}
-func (k Keeper) ResolveController(ctx sdk.Context, did string) (controller.ControllerI, error) {
- ct, err := k.OrmDB.ControllerTable().GetByDid(ctx, did)
- if err != nil {
- return nil, err
- }
- c, err := controller.LoadFromTableEntry(ctx, ct)
- if err != nil {
- return nil, err
- }
- return c, nil
-}
-
+// func (k Keeper) ResolveController(ctx sdk.Context, did string) (controller.ControllerI, error) {
+// ct, err := k.OrmDB.ControllerTable().GetByDid(ctx, did)
+// if err != nil {
+// return nil, err
+// }
+// c, err := controller.LoadFromTableEntry(ctx, ct)
+// if err != nil {
+// return nil, err
+// }
+// return c, nil
+// }
+//
// Logger returns the logger
func (k Keeper) Logger() log.Logger {
return k.logger
diff --git a/x/did/types/pubkey.go b/x/did/types/pubkey.go
index 88c1721f4..0910c0cef 100644
--- a/x/did/types/pubkey.go
+++ b/x/did/types/pubkey.go
@@ -16,11 +16,6 @@ type PubKeyI interface {
// GetJwk() *commonv1.JSONWebKey
}
-// PubKey defines a generic pubkey.
-type PublicKey interface {
- VerifySignature(msg, sig []byte) bool
-}
-
type PubKeyG[T any] interface {
*T
PublicKey
diff --git a/x/did/types/state.pb.go b/x/did/types/state.pb.go
index 5699701fa..a30b9ccd2 100644
--- a/x/did/types/state.pb.go
+++ b/x/did/types/state.pb.go
@@ -23,7 +23,7 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-type Assertion struct {
+type Account struct {
// The unique identifier of the assertion
Did string `protobuf:"bytes,1,opt,name=did,proto3" json:"did,omitempty"`
// The authentication of the DID
@@ -40,18 +40,18 @@ type Assertion struct {
CreationBlock int64 `protobuf:"varint,7,opt,name=creation_block,json=creationBlock,proto3" json:"creation_block,omitempty"`
}
-func (m *Assertion) Reset() { *m = Assertion{} }
-func (m *Assertion) String() string { return proto.CompactTextString(m) }
-func (*Assertion) ProtoMessage() {}
-func (*Assertion) Descriptor() ([]byte, []int) {
+func (m *Account) Reset() { *m = Account{} }
+func (m *Account) String() string { return proto.CompactTextString(m) }
+func (*Account) ProtoMessage() {}
+func (*Account) Descriptor() ([]byte, []int) {
return fileDescriptor_f44bb702879c34b4, []int{0}
}
-func (m *Assertion) XXX_Unmarshal(b []byte) error {
+func (m *Account) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *Assertion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_Assertion.Marshal(b, m, deterministic)
+ return xxx_messageInfo_Account.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -61,253 +61,69 @@ func (m *Assertion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return b[:n], nil
}
}
-func (m *Assertion) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Assertion.Merge(m, src)
+func (m *Account) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Account.Merge(m, src)
}
-func (m *Assertion) XXX_Size() int {
+func (m *Account) XXX_Size() int {
return m.Size()
}
-func (m *Assertion) XXX_DiscardUnknown() {
- xxx_messageInfo_Assertion.DiscardUnknown(m)
+func (m *Account) XXX_DiscardUnknown() {
+ xxx_messageInfo_Account.DiscardUnknown(m)
}
-var xxx_messageInfo_Assertion proto.InternalMessageInfo
+var xxx_messageInfo_Account proto.InternalMessageInfo
-func (m *Assertion) GetDid() string {
+func (m *Account) GetDid() string {
if m != nil {
return m.Did
}
return ""
}
-func (m *Assertion) GetController() string {
+func (m *Account) GetController() string {
if m != nil {
return m.Controller
}
return ""
}
-func (m *Assertion) GetSubject() string {
+func (m *Account) GetSubject() string {
if m != nil {
return m.Subject
}
return ""
}
-func (m *Assertion) GetPublicKeyHex() string {
+func (m *Account) GetPublicKeyHex() string {
if m != nil {
return m.PublicKeyHex
}
return ""
}
-func (m *Assertion) GetAssertionType() string {
+func (m *Account) GetAssertionType() string {
if m != nil {
return m.AssertionType
}
return ""
}
-func (m *Assertion) GetAccumulator() map[string][]byte {
+func (m *Account) GetAccumulator() map[string][]byte {
if m != nil {
return m.Accumulator
}
return nil
}
-func (m *Assertion) GetCreationBlock() int64 {
+func (m *Account) GetCreationBlock() int64 {
if m != nil {
return m.CreationBlock
}
return 0
}
-type Authentication struct {
- // The unique identifier of the authentication
- Did string `protobuf:"bytes,1,opt,name=did,proto3" json:"did,omitempty"`
- // The authentication of the DID
- Controller string `protobuf:"bytes,2,opt,name=controller,proto3" json:"controller,omitempty"`
- // Origin of the authentication
- Subject string `protobuf:"bytes,3,opt,name=subject,proto3" json:"subject,omitempty"`
- // string is the verification method
- PublicKeyHex string `protobuf:"bytes,4,opt,name=public_key_hex,json=publicKeyHex,proto3" json:"public_key_hex,omitempty"`
- // CredentialID is the byte representation of the credential ID
- CredentialId []byte `protobuf:"bytes,5,opt,name=credential_id,json=credentialId,proto3" json:"credential_id,omitempty"`
- // Metadata of the authentication
- Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
- // CreationBlock is the block number of the creation of the authentication
- CreationBlock int64 `protobuf:"varint,7,opt,name=creation_block,json=creationBlock,proto3" json:"creation_block,omitempty"`
-}
-
-func (m *Authentication) Reset() { *m = Authentication{} }
-func (m *Authentication) String() string { return proto.CompactTextString(m) }
-func (*Authentication) ProtoMessage() {}
-func (*Authentication) Descriptor() ([]byte, []int) {
- return fileDescriptor_f44bb702879c34b4, []int{1}
-}
-func (m *Authentication) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Authentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Authentication.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalToSizedBuffer(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Authentication) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Authentication.Merge(m, src)
-}
-func (m *Authentication) XXX_Size() int {
- return m.Size()
-}
-func (m *Authentication) XXX_DiscardUnknown() {
- xxx_messageInfo_Authentication.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Authentication proto.InternalMessageInfo
-
-func (m *Authentication) GetDid() string {
- if m != nil {
- return m.Did
- }
- return ""
-}
-
-func (m *Authentication) GetController() string {
- if m != nil {
- return m.Controller
- }
- return ""
-}
-
-func (m *Authentication) GetSubject() string {
- if m != nil {
- return m.Subject
- }
- return ""
-}
-
-func (m *Authentication) GetPublicKeyHex() string {
- if m != nil {
- return m.PublicKeyHex
- }
- return ""
-}
-
-func (m *Authentication) GetCredentialId() []byte {
- if m != nil {
- return m.CredentialId
- }
- return nil
-}
-
-func (m *Authentication) GetMetadata() map[string]string {
- if m != nil {
- return m.Metadata
- }
- return nil
-}
-
-func (m *Authentication) GetCreationBlock() int64 {
- if m != nil {
- return m.CreationBlock
- }
- return 0
-}
-
-// Macaroon is a Macaroon message type.
-type Biscuit struct {
- Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
- Controller string `protobuf:"bytes,2,opt,name=controller,proto3" json:"controller,omitempty"`
- Subject string `protobuf:"bytes,3,opt,name=subject,proto3" json:"subject,omitempty"`
- Origin string `protobuf:"bytes,4,opt,name=origin,proto3" json:"origin,omitempty"`
- ExpiryHeight int64 `protobuf:"varint,5,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"`
- Macaroon string `protobuf:"bytes,6,opt,name=macaroon,proto3" json:"macaroon,omitempty"`
-}
-
-func (m *Biscuit) Reset() { *m = Biscuit{} }
-func (m *Biscuit) String() string { return proto.CompactTextString(m) }
-func (*Biscuit) ProtoMessage() {}
-func (*Biscuit) Descriptor() ([]byte, []int) {
- return fileDescriptor_f44bb702879c34b4, []int{2}
-}
-func (m *Biscuit) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Biscuit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Biscuit.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalToSizedBuffer(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Biscuit) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Biscuit.Merge(m, src)
-}
-func (m *Biscuit) XXX_Size() int {
- return m.Size()
-}
-func (m *Biscuit) XXX_DiscardUnknown() {
- xxx_messageInfo_Biscuit.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Biscuit proto.InternalMessageInfo
-
-func (m *Biscuit) GetId() uint64 {
- if m != nil {
- return m.Id
- }
- return 0
-}
-
-func (m *Biscuit) GetController() string {
- if m != nil {
- return m.Controller
- }
- return ""
-}
-
-func (m *Biscuit) GetSubject() string {
- if m != nil {
- return m.Subject
- }
- return ""
-}
-
-func (m *Biscuit) GetOrigin() string {
- if m != nil {
- return m.Origin
- }
- return ""
-}
-
-func (m *Biscuit) GetExpiryHeight() int64 {
- if m != nil {
- return m.ExpiryHeight
- }
- return 0
-}
-
-func (m *Biscuit) GetMacaroon() string {
- if m != nil {
- return m.Macaroon
- }
- return ""
-}
-
-// Controller represents a Sonr DWN Vault
-type Controller struct {
+// PublicKey represents a public key
+type PublicKey struct {
// The unique identifier of the controller
Number uint64 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"`
// The unique identifier of the controller
@@ -328,18 +144,18 @@ type Controller struct {
CreationBlock int64 `protobuf:"varint,9,opt,name=creation_block,json=creationBlock,proto3" json:"creation_block,omitempty"`
}
-func (m *Controller) Reset() { *m = Controller{} }
-func (m *Controller) String() string { return proto.CompactTextString(m) }
-func (*Controller) ProtoMessage() {}
-func (*Controller) Descriptor() ([]byte, []int) {
- return fileDescriptor_f44bb702879c34b4, []int{3}
+func (m *PublicKey) Reset() { *m = PublicKey{} }
+func (m *PublicKey) String() string { return proto.CompactTextString(m) }
+func (*PublicKey) ProtoMessage() {}
+func (*PublicKey) Descriptor() ([]byte, []int) {
+ return fileDescriptor_f44bb702879c34b4, []int{1}
}
-func (m *Controller) XXX_Unmarshal(b []byte) error {
+func (m *PublicKey) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *Controller) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *PublicKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_Controller.Marshal(b, m, deterministic)
+ return xxx_messageInfo_PublicKey.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -349,75 +165,75 @@ func (m *Controller) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return b[:n], nil
}
}
-func (m *Controller) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Controller.Merge(m, src)
+func (m *PublicKey) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_PublicKey.Merge(m, src)
}
-func (m *Controller) XXX_Size() int {
+func (m *PublicKey) XXX_Size() int {
return m.Size()
}
-func (m *Controller) XXX_DiscardUnknown() {
- xxx_messageInfo_Controller.DiscardUnknown(m)
+func (m *PublicKey) XXX_DiscardUnknown() {
+ xxx_messageInfo_PublicKey.DiscardUnknown(m)
}
-var xxx_messageInfo_Controller proto.InternalMessageInfo
+var xxx_messageInfo_PublicKey proto.InternalMessageInfo
-func (m *Controller) GetNumber() uint64 {
+func (m *PublicKey) GetNumber() uint64 {
if m != nil {
return m.Number
}
return 0
}
-func (m *Controller) GetDid() string {
+func (m *PublicKey) GetDid() string {
if m != nil {
return m.Did
}
return ""
}
-func (m *Controller) GetSonrAddress() string {
+func (m *PublicKey) GetSonrAddress() string {
if m != nil {
return m.SonrAddress
}
return ""
}
-func (m *Controller) GetEthAddress() string {
+func (m *PublicKey) GetEthAddress() string {
if m != nil {
return m.EthAddress
}
return ""
}
-func (m *Controller) GetBtcAddress() string {
+func (m *PublicKey) GetBtcAddress() string {
if m != nil {
return m.BtcAddress
}
return ""
}
-func (m *Controller) GetPublicKeyHex() string {
+func (m *PublicKey) GetPublicKeyHex() string {
if m != nil {
return m.PublicKeyHex
}
return ""
}
-func (m *Controller) GetKsVal() string {
+func (m *PublicKey) GetKsVal() string {
if m != nil {
return m.KsVal
}
return ""
}
-func (m *Controller) GetClaimedBlock() int64 {
+func (m *PublicKey) GetClaimedBlock() int64 {
if m != nil {
return m.ClaimedBlock
}
return 0
}
-func (m *Controller) GetCreationBlock() int64 {
+func (m *PublicKey) GetCreationBlock() int64 {
if m != nil {
return m.CreationBlock
}
@@ -450,7 +266,7 @@ func (m *Verification) Reset() { *m = Verification{} }
func (m *Verification) String() string { return proto.CompactTextString(m) }
func (*Verification) ProtoMessage() {}
func (*Verification) Descriptor() ([]byte, []int) {
- return fileDescriptor_f44bb702879c34b4, []int{4}
+ return fileDescriptor_f44bb702879c34b4, []int{2}
}
func (m *Verification) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -543,12 +359,9 @@ func (m *Verification) GetCreationBlock() int64 {
}
func init() {
- proto.RegisterType((*Assertion)(nil), "did.v1.Assertion")
- proto.RegisterMapType((map[string][]byte)(nil), "did.v1.Assertion.AccumulatorEntry")
- proto.RegisterType((*Authentication)(nil), "did.v1.Authentication")
- proto.RegisterMapType((map[string]string)(nil), "did.v1.Authentication.MetadataEntry")
- proto.RegisterType((*Biscuit)(nil), "did.v1.Biscuit")
- proto.RegisterType((*Controller)(nil), "did.v1.Controller")
+ proto.RegisterType((*Account)(nil), "did.v1.Account")
+ proto.RegisterMapType((map[string][]byte)(nil), "did.v1.Account.AccumulatorEntry")
+ proto.RegisterType((*PublicKey)(nil), "did.v1.PublicKey")
proto.RegisterType((*Verification)(nil), "did.v1.Verification")
proto.RegisterMapType((map[string]string)(nil), "did.v1.Verification.MetadataEntry")
}
@@ -556,62 +369,54 @@ func init() {
func init() { proto.RegisterFile("did/v1/state.proto", fileDescriptor_f44bb702879c34b4) }
var fileDescriptor_f44bb702879c34b4 = []byte{
- // 821 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x95, 0xdf, 0x8a, 0x23, 0x45,
- 0x14, 0xc6, 0xa7, 0xba, 0x27, 0x3d, 0x93, 0x33, 0x99, 0xd0, 0x5b, 0x8c, 0x6b, 0x31, 0x68, 0x8c,
- 0xd9, 0x75, 0x19, 0x71, 0x48, 0x58, 0xbd, 0x91, 0x51, 0x16, 0x67, 0x54, 0x58, 0x91, 0xbd, 0x89,
- 0xb2, 0xa0, 0x37, 0xa1, 0xba, 0xab, 0x9c, 0x94, 0xe9, 0xee, 0x8a, 0x55, 0xd5, 0x61, 0xf2, 0x12,
- 0xe2, 0x13, 0xf8, 0x3c, 0x5e, 0x2e, 0xe8, 0x85, 0x97, 0x32, 0xf3, 0x06, 0x5e, 0x09, 0x0a, 0x4a,
- 0x55, 0x75, 0x27, 0x1d, 0x37, 0xb0, 0xba, 0x0a, 0x7b, 0x13, 0x72, 0xbe, 0x3e, 0xf5, 0xe7, 0xfc,
- 0xce, 0xd7, 0xa7, 0x01, 0x33, 0xc1, 0x46, 0x8b, 0xfb, 0x23, 0x6d, 0xa8, 0xe1, 0xc3, 0xb9, 0x92,
- 0x46, 0xe2, 0x88, 0x09, 0x36, 0x5c, 0xdc, 0x3f, 0x7e, 0x39, 0x95, 0x3a, 0x97, 0x7a, 0x24, 0x55,
- 0x6e, 0x53, 0xa4, 0xca, 0x7d, 0xc2, 0xf1, 0x51, 0xb5, 0xe8, 0x92, 0x17, 0x5c, 0x0b, 0xed, 0xd5,
- 0xc1, 0x1f, 0x01, 0xb4, 0xcf, 0xb5, 0xe6, 0xca, 0x08, 0x59, 0xe0, 0x18, 0x42, 0x26, 0x18, 0x41,
- 0x7d, 0x74, 0xd2, 0x1e, 0xdb, 0xbf, 0xb8, 0x07, 0x90, 0xca, 0xc2, 0x28, 0x99, 0x65, 0x5c, 0x91,
- 0xc0, 0x3d, 0x68, 0x28, 0x98, 0xc0, 0x9e, 0x2e, 0x93, 0xaf, 0x79, 0x6a, 0x48, 0xe8, 0x1e, 0xd6,
- 0x21, 0xbe, 0x0b, 0xdd, 0x79, 0x99, 0x64, 0x22, 0x9d, 0xcc, 0xf8, 0x72, 0x32, 0xe5, 0x57, 0x64,
- 0xd7, 0x25, 0x74, 0xbc, 0xfa, 0x29, 0x5f, 0x3e, 0xe4, 0x57, 0xf8, 0x0d, 0xe8, 0xd2, 0xfa, 0xf8,
- 0x89, 0x59, 0xce, 0x39, 0x69, 0xb9, 0xac, 0xc3, 0x95, 0xfa, 0xf9, 0x72, 0xce, 0xf1, 0x47, 0x70,
- 0x40, 0xd3, 0xb4, 0xcc, 0xcb, 0x8c, 0x1a, 0xa9, 0x48, 0xd4, 0x0f, 0x4f, 0x0e, 0xde, 0x1e, 0x0c,
- 0x7d, 0xcd, 0xc3, 0x55, 0x01, 0xc3, 0xf3, 0x75, 0xd2, 0xc7, 0x85, 0x51, 0xcb, 0x71, 0x73, 0x99,
- 0x3d, 0x2c, 0x55, 0x9c, 0xba, 0xb3, 0x92, 0x4c, 0xa6, 0x33, 0xb2, 0xd7, 0x47, 0x27, 0xe1, 0xf8,
- 0xb0, 0x56, 0x2f, 0xac, 0x78, 0xfc, 0x00, 0xe2, 0xbf, 0xef, 0x63, 0xc9, 0xcc, 0xf8, 0xb2, 0x26,
- 0x33, 0xe3, 0x4b, 0x7c, 0x04, 0xad, 0x05, 0xcd, 0x4a, 0xee, 0xa0, 0x74, 0xc6, 0x3e, 0x38, 0x0b,
- 0xde, 0x45, 0x67, 0x6f, 0xfe, 0xfa, 0xfd, 0x8f, 0xdf, 0x86, 0x77, 0xa0, 0xe5, 0x68, 0x62, 0x02,
- 0x78, 0x0d, 0xec, 0xb4, 0xc2, 0x13, 0x23, 0x82, 0x08, 0x1a, 0xfc, 0x16, 0x40, 0xf7, 0xbc, 0x34,
- 0x53, 0x5e, 0x18, 0x91, 0xd2, 0x17, 0xd4, 0x83, 0x3b, 0x60, 0x01, 0x30, 0x7b, 0x07, 0x9a, 0x4d,
- 0x04, 0x73, 0x2d, 0xe8, 0x8c, 0x3b, 0x6b, 0xf1, 0x13, 0x86, 0x3f, 0x80, 0xfd, 0x9c, 0x1b, 0xca,
- 0xa8, 0xa1, 0x15, 0xfe, 0xbb, 0x2b, 0xfc, 0x1b, 0x05, 0x0c, 0x1f, 0x55, 0x69, 0xbe, 0x01, 0xab,
- 0x55, 0xff, 0x94, 0xfe, 0x7b, 0x70, 0xb8, 0xb1, 0xc3, 0xb3, 0xd0, 0xb7, 0x9f, 0x0b, 0x7d, 0x30,
- 0xf8, 0x09, 0xc1, 0xde, 0x85, 0xd0, 0x69, 0x29, 0x0c, 0xee, 0x42, 0x50, 0x21, 0xdf, 0x1d, 0x07,
- 0xff, 0x89, 0xf8, 0x6d, 0x88, 0xa4, 0x12, 0x97, 0xa2, 0xa8, 0x48, 0x57, 0x91, 0x65, 0xcc, 0xaf,
- 0xe6, 0x42, 0xd9, 0x2e, 0x88, 0xcb, 0xa9, 0x71, 0x8c, 0xc3, 0x71, 0xc7, 0x8b, 0x0f, 0x9d, 0x86,
- 0x8f, 0x61, 0x3f, 0xa7, 0x29, 0x55, 0x52, 0x16, 0x24, 0x72, 0xcb, 0x57, 0xf1, 0xd9, 0x3d, 0x57,
- 0x59, 0x1f, 0x22, 0x7b, 0xd5, 0x18, 0xe1, 0x23, 0xe8, 0x56, 0x67, 0x9e, 0xfa, 0x23, 0x5c, 0x59,
- 0xad, 0xc1, 0x9f, 0x01, 0xc0, 0x87, 0xeb, 0x9b, 0xde, 0x86, 0xa8, 0x28, 0xf3, 0x84, 0xab, 0xaa,
- 0xba, 0x2a, 0xaa, 0x5d, 0x16, 0xac, 0x5d, 0xf6, 0x3a, 0x74, 0xb4, 0x2c, 0xd4, 0x84, 0x32, 0xa6,
- 0xb8, 0xd6, 0x55, 0x61, 0x07, 0x56, 0x3b, 0xf7, 0x12, 0x7e, 0x0d, 0x0e, 0xb8, 0x99, 0xae, 0x32,
- 0x7c, 0x85, 0xc0, 0xcd, 0xb4, 0x91, 0x90, 0x98, 0x74, 0x95, 0xe0, 0x5f, 0x65, 0x48, 0x4c, 0x5a,
- 0x27, 0x3c, 0x6d, 0xc8, 0x68, 0x8b, 0x21, 0x5f, 0x82, 0x68, 0xa6, 0x27, 0x0b, 0x9a, 0x39, 0x87,
- 0xb4, 0xc7, 0xad, 0x99, 0x7e, 0x4c, 0x33, 0xe7, 0xd3, 0x8c, 0x8a, 0x9c, 0xb3, 0xca, 0x3f, 0xfb,
- 0x9e, 0x61, 0x25, 0x3a, 0xfb, 0x6c, 0x71, 0x59, 0x7b, 0x8b, 0xcb, 0xce, 0xbe, 0x70, 0x38, 0x3f,
- 0x03, 0xa8, 0xf9, 0xc4, 0x08, 0xe3, 0x4d, 0x02, 0x16, 0x28, 0xbe, 0xb5, 0x51, 0x72, 0x1c, 0x78,
- 0xa9, 0x51, 0x64, 0x1c, 0x12, 0x84, 0xdb, 0x8e, 0x66, 0xbc, 0x4b, 0x10, 0x09, 0x07, 0xbf, 0x87,
- 0xd0, 0x79, 0xcc, 0x95, 0xf8, 0xea, 0xf9, 0xdf, 0xe8, 0x57, 0x01, 0x98, 0x60, 0x93, 0x9c, 0x9b,
- 0xa9, 0x64, 0x55, 0x27, 0xda, 0x4c, 0xb0, 0x47, 0x4e, 0xb0, 0x4d, 0x15, 0x5a, 0x97, 0x5c, 0xd5,
- 0x26, 0xf3, 0x51, 0xd3, 0x96, 0xad, 0x67, 0x0d, 0x82, 0x6d, 0xdc, 0xdf, 0x82, 0x5b, 0x8b, 0xc6,
- 0xc5, 0xfd, 0x3c, 0xf6, 0x2d, 0x88, 0x9b, 0x0f, 0xdc, 0x48, 0x7e, 0xd0, 0x18, 0x08, 0xfb, 0x9b,
- 0xf3, 0xb8, 0x59, 0xfd, 0xbf, 0x18, 0x07, 0xed, 0xff, 0x7d, 0x1c, 0x7c, 0xe3, 0xba, 0x3c, 0xab,
- 0xc7, 0xc1, 0x11, 0x74, 0x3d, 0xa9, 0xe6, 0x28, 0xc0, 0x03, 0x78, 0xa5, 0x31, 0x24, 0xd6, 0xdc,
- 0x4f, 0x7d, 0xae, 0xeb, 0xf9, 0x3d, 0xe8, 0x3f, 0x45, 0xa6, 0xde, 0xa4, 0xce, 0x0b, 0x09, 0x22,
- 0xd1, 0xc5, 0xfb, 0x3f, 0x5c, 0xf7, 0xd0, 0x93, 0xeb, 0x1e, 0xfa, 0xe5, 0xba, 0x87, 0xbe, 0xbb,
- 0xe9, 0xed, 0x3c, 0xb9, 0xe9, 0xed, 0xfc, 0x7c, 0xd3, 0xdb, 0xf9, 0x72, 0x70, 0x29, 0xcc, 0xb4,
- 0x4c, 0x86, 0xa9, 0xcc, 0x47, 0xb2, 0xb0, 0x4e, 0x1b, 0xb9, 0x9f, 0xab, 0x91, 0xfd, 0x32, 0xdb,
- 0x1d, 0x75, 0x12, 0xb9, 0xaf, 0xf2, 0x3b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xce, 0xd1, 0x02,
- 0x2a, 0xe2, 0x07, 0x00, 0x00,
+ // 690 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xd1, 0x6a, 0x13, 0x4b,
+ 0x1c, 0xc6, 0x3b, 0xd9, 0x26, 0x6d, 0xfe, 0x49, 0xca, 0x76, 0xe8, 0x39, 0x67, 0x08, 0xe7, 0xe4,
+ 0xc4, 0x54, 0xa5, 0x62, 0x49, 0xa8, 0xde, 0x48, 0x95, 0x42, 0x0b, 0x82, 0x20, 0x05, 0x89, 0x52,
+ 0xd0, 0x9b, 0xb0, 0x3b, 0x33, 0x36, 0x6b, 0x76, 0x77, 0xe2, 0xcc, 0x6c, 0xe8, 0xbe, 0x84, 0xf8,
+ 0x04, 0x3e, 0x8f, 0x97, 0x05, 0x6f, 0xbc, 0x94, 0xf6, 0x0d, 0xbc, 0x12, 0x04, 0x91, 0x9d, 0xd9,
+ 0x4d, 0xb7, 0x36, 0x50, 0xf1, 0x26, 0xc9, 0x7c, 0xf3, 0xcd, 0xcc, 0xce, 0xef, 0xcb, 0xb7, 0x80,
+ 0x59, 0xc0, 0x06, 0xb3, 0x9d, 0x81, 0xd2, 0x9e, 0xe6, 0xfd, 0xa9, 0x14, 0x5a, 0xe0, 0x1a, 0x0b,
+ 0x58, 0x7f, 0xb6, 0xd3, 0xfe, 0x87, 0x0a, 0x15, 0x09, 0x35, 0x10, 0x32, 0xca, 0x2c, 0x42, 0x46,
+ 0xd6, 0xd0, 0xde, 0xc8, 0x17, 0x1d, 0xf3, 0x98, 0xab, 0x40, 0x59, 0xb5, 0xf7, 0xad, 0x02, 0x2b,
+ 0xfb, 0x94, 0x8a, 0x24, 0xd6, 0xd8, 0x05, 0x87, 0x05, 0x8c, 0xa0, 0x2e, 0xda, 0xaa, 0x0f, 0xb3,
+ 0x9f, 0xb8, 0x03, 0x40, 0x45, 0xac, 0xa5, 0x08, 0x43, 0x2e, 0x49, 0xc5, 0x4c, 0x94, 0x14, 0x4c,
+ 0x60, 0x45, 0x25, 0xfe, 0x1b, 0x4e, 0x35, 0x71, 0xcc, 0x64, 0x31, 0xc4, 0x37, 0x61, 0x6d, 0x9a,
+ 0xf8, 0x61, 0x40, 0x47, 0x13, 0x9e, 0x8e, 0xc6, 0xfc, 0x84, 0x2c, 0x1b, 0x43, 0xd3, 0xaa, 0x4f,
+ 0x79, 0xfa, 0x84, 0x9f, 0xe0, 0x5b, 0xb0, 0xe6, 0x29, 0xc5, 0xa5, 0x0e, 0x44, 0x3c, 0xd2, 0xe9,
+ 0x94, 0x93, 0xaa, 0x71, 0xb5, 0xe6, 0xea, 0x8b, 0x74, 0xca, 0xf1, 0x01, 0x34, 0x3c, 0x4a, 0x93,
+ 0x28, 0x09, 0x3d, 0x2d, 0x24, 0xa9, 0x75, 0x9d, 0xad, 0xc6, 0xbd, 0x6e, 0xdf, 0xde, 0xb8, 0x9f,
+ 0x3f, 0x7e, 0xf6, 0x5d, 0x58, 0x1e, 0xc7, 0x5a, 0xa6, 0xc3, 0xf2, 0xa2, 0xec, 0x28, 0x2a, 0xb9,
+ 0x67, 0x4e, 0xf2, 0x43, 0x41, 0x27, 0x64, 0xa5, 0x8b, 0xb6, 0x9c, 0x61, 0xab, 0x50, 0x0f, 0x32,
+ 0xb1, 0xbd, 0x07, 0xee, 0xaf, 0xfb, 0x64, 0x5c, 0x26, 0x3c, 0x2d, 0xb8, 0x4c, 0x78, 0x8a, 0x37,
+ 0xa0, 0x3a, 0xf3, 0xc2, 0x84, 0x1b, 0x24, 0xcd, 0xa1, 0x1d, 0xec, 0x56, 0x1e, 0xa0, 0xdd, 0x3b,
+ 0x5f, 0x3f, 0x7c, 0x7a, 0xe7, 0x6c, 0x42, 0xd5, 0xb0, 0xc4, 0x04, 0xf0, 0x05, 0xae, 0xed, 0x1c,
+ 0x8e, 0x8b, 0x08, 0x22, 0xa8, 0xf7, 0xa3, 0x02, 0xf5, 0x67, 0x05, 0x0d, 0xfc, 0x37, 0xd4, 0xe2,
+ 0x24, 0xf2, 0xb9, 0x34, 0xe7, 0x2c, 0x0f, 0xf3, 0x51, 0x11, 0x4a, 0xe5, 0x22, 0x94, 0x1b, 0xd0,
+ 0x54, 0x22, 0x96, 0x23, 0x8f, 0x31, 0xc9, 0x95, 0xca, 0xc9, 0x37, 0x32, 0x6d, 0xdf, 0x4a, 0xf8,
+ 0x7f, 0x68, 0x70, 0x3d, 0x9e, 0x3b, 0x2c, 0x7a, 0xe0, 0x7a, 0x5c, 0x32, 0xf8, 0x9a, 0xce, 0x0d,
+ 0x96, 0x3a, 0xf8, 0x9a, 0x16, 0x86, 0xab, 0xf9, 0xd5, 0x16, 0xe4, 0xf7, 0x17, 0xd4, 0x26, 0x6a,
+ 0x34, 0xf3, 0x42, 0x03, 0xb3, 0x3e, 0xac, 0x4e, 0xd4, 0x91, 0x17, 0xe2, 0x4d, 0x68, 0xd1, 0xd0,
+ 0x0b, 0x22, 0xce, 0x72, 0xd4, 0xab, 0x06, 0x75, 0x33, 0x17, 0x0d, 0xe9, 0x05, 0x81, 0xd4, 0x17,
+ 0x04, 0xb2, 0xfb, 0xd2, 0x00, 0x7d, 0x0e, 0x50, 0xf0, 0x71, 0x11, 0xc6, 0x97, 0x09, 0x64, 0x3c,
+ 0xf1, 0xfa, 0xa5, 0x2b, 0xbb, 0x15, 0x2b, 0x95, 0x2e, 0xe9, 0x3a, 0x04, 0xe1, 0xba, 0xa1, 0xe9,
+ 0x2e, 0x13, 0x44, 0x2a, 0xbd, 0xef, 0x0e, 0x34, 0x8f, 0xb8, 0x0c, 0x5e, 0x07, 0xd4, 0x1c, 0xf8,
+ 0x07, 0x05, 0xf8, 0x0f, 0x80, 0x05, 0x6c, 0x14, 0x71, 0x3d, 0x16, 0x2c, 0x4f, 0xa2, 0xce, 0x02,
+ 0x76, 0x68, 0x84, 0x2c, 0xd4, 0x40, 0xa9, 0x84, 0xcb, 0x3c, 0x82, 0x7c, 0x54, 0xee, 0x4d, 0xf5,
+ 0xba, 0xde, 0x2c, 0xe2, 0x7e, 0x17, 0xd6, 0x67, 0xa5, 0x07, 0xb7, 0xd5, 0xb1, 0x11, 0xb8, 0xe5,
+ 0x09, 0xd3, 0x9e, 0x3d, 0x58, 0x8d, 0xb8, 0xf6, 0x98, 0xa7, 0x3d, 0xb2, 0x6a, 0xaa, 0xd3, 0x2b,
+ 0xaa, 0x53, 0xbe, 0x7d, 0xff, 0x30, 0x37, 0xd9, 0xf2, 0xcc, 0xd7, 0xfc, 0x66, 0x50, 0xed, 0x87,
+ 0xd0, 0xba, 0xb4, 0xc3, 0x75, 0xb5, 0xa9, 0x97, 0x6b, 0xf3, 0xd6, 0xa4, 0x3c, 0x29, 0x6a, 0xb3,
+ 0x01, 0x6b, 0x96, 0x54, 0xb9, 0x32, 0xb8, 0x07, 0xff, 0x96, 0xca, 0x74, 0xc1, 0x7d, 0xdb, 0x7a,
+ 0x4d, 0xe6, 0xb7, 0xa1, 0x7b, 0x85, 0x4c, 0xb1, 0x49, 0xe1, 0x73, 0x08, 0x22, 0xce, 0xc1, 0xa3,
+ 0x8f, 0x67, 0x1d, 0x74, 0x7a, 0xd6, 0x41, 0x5f, 0xce, 0x3a, 0xe8, 0xfd, 0x79, 0x67, 0xe9, 0xf4,
+ 0xbc, 0xb3, 0xf4, 0xf9, 0xbc, 0xb3, 0xf4, 0xaa, 0x77, 0x1c, 0xe8, 0x71, 0xe2, 0xf7, 0xa9, 0x88,
+ 0x06, 0x22, 0xce, 0xfe, 0x69, 0x03, 0xf3, 0x71, 0x32, 0xc8, 0x5e, 0xa1, 0xd9, 0x8e, 0xca, 0xaf,
+ 0x99, 0xd7, 0xe7, 0xfd, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xe7, 0x64, 0xd4, 0x8b, 0x05,
+ 0x00, 0x00,
}
-func (m *Assertion) Marshal() (dAtA []byte, err error) {
+func (m *Account) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -621,12 +426,12 @@ func (m *Assertion) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *Assertion) MarshalTo(dAtA []byte) (int, error) {
+func (m *Account) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *Assertion) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *Account) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -695,7 +500,7 @@ func (m *Assertion) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
-func (m *Authentication) Marshal() (dAtA []byte, err error) {
+func (m *PublicKey) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -705,155 +510,12 @@ func (m *Authentication) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *Authentication) MarshalTo(dAtA []byte) (int, error) {
+func (m *PublicKey) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *Authentication) MarshalToSizedBuffer(dAtA []byte) (int, error) {
- i := len(dAtA)
- _ = i
- var l int
- _ = l
- if m.CreationBlock != 0 {
- i = encodeVarintState(dAtA, i, uint64(m.CreationBlock))
- i--
- dAtA[i] = 0x38
- }
- if len(m.Metadata) > 0 {
- for k := range m.Metadata {
- v := m.Metadata[k]
- baseI := i
- i -= len(v)
- copy(dAtA[i:], v)
- i = encodeVarintState(dAtA, i, uint64(len(v)))
- i--
- dAtA[i] = 0x12
- i -= len(k)
- copy(dAtA[i:], k)
- i = encodeVarintState(dAtA, i, uint64(len(k)))
- i--
- dAtA[i] = 0xa
- i = encodeVarintState(dAtA, i, uint64(baseI-i))
- i--
- dAtA[i] = 0x32
- }
- }
- if len(m.CredentialId) > 0 {
- i -= len(m.CredentialId)
- copy(dAtA[i:], m.CredentialId)
- i = encodeVarintState(dAtA, i, uint64(len(m.CredentialId)))
- i--
- dAtA[i] = 0x2a
- }
- if len(m.PublicKeyHex) > 0 {
- i -= len(m.PublicKeyHex)
- copy(dAtA[i:], m.PublicKeyHex)
- i = encodeVarintState(dAtA, i, uint64(len(m.PublicKeyHex)))
- i--
- dAtA[i] = 0x22
- }
- if len(m.Subject) > 0 {
- i -= len(m.Subject)
- copy(dAtA[i:], m.Subject)
- i = encodeVarintState(dAtA, i, uint64(len(m.Subject)))
- i--
- dAtA[i] = 0x1a
- }
- if len(m.Controller) > 0 {
- i -= len(m.Controller)
- copy(dAtA[i:], m.Controller)
- i = encodeVarintState(dAtA, i, uint64(len(m.Controller)))
- i--
- dAtA[i] = 0x12
- }
- if len(m.Did) > 0 {
- i -= len(m.Did)
- copy(dAtA[i:], m.Did)
- i = encodeVarintState(dAtA, i, uint64(len(m.Did)))
- i--
- dAtA[i] = 0xa
- }
- return len(dAtA) - i, nil
-}
-
-func (m *Biscuit) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalToSizedBuffer(dAtA[:size])
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Biscuit) MarshalTo(dAtA []byte) (int, error) {
- size := m.Size()
- return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Biscuit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
- i := len(dAtA)
- _ = i
- var l int
- _ = l
- if len(m.Macaroon) > 0 {
- i -= len(m.Macaroon)
- copy(dAtA[i:], m.Macaroon)
- i = encodeVarintState(dAtA, i, uint64(len(m.Macaroon)))
- i--
- dAtA[i] = 0x32
- }
- if m.ExpiryHeight != 0 {
- i = encodeVarintState(dAtA, i, uint64(m.ExpiryHeight))
- i--
- dAtA[i] = 0x28
- }
- if len(m.Origin) > 0 {
- i -= len(m.Origin)
- copy(dAtA[i:], m.Origin)
- i = encodeVarintState(dAtA, i, uint64(len(m.Origin)))
- i--
- dAtA[i] = 0x22
- }
- if len(m.Subject) > 0 {
- i -= len(m.Subject)
- copy(dAtA[i:], m.Subject)
- i = encodeVarintState(dAtA, i, uint64(len(m.Subject)))
- i--
- dAtA[i] = 0x1a
- }
- if len(m.Controller) > 0 {
- i -= len(m.Controller)
- copy(dAtA[i:], m.Controller)
- i = encodeVarintState(dAtA, i, uint64(len(m.Controller)))
- i--
- dAtA[i] = 0x12
- }
- if m.Id != 0 {
- i = encodeVarintState(dAtA, i, uint64(m.Id))
- i--
- dAtA[i] = 0x8
- }
- return len(dAtA) - i, nil
-}
-
-func (m *Controller) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalToSizedBuffer(dAtA[:size])
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Controller) MarshalTo(dAtA []byte) (int, error) {
- size := m.Size()
- return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Controller) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *PublicKey) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -1025,7 +687,7 @@ func encodeVarintState(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
return base
}
-func (m *Assertion) Size() (n int) {
+func (m *Account) Size() (n int) {
if m == nil {
return 0
}
@@ -1069,78 +731,7 @@ func (m *Assertion) Size() (n int) {
return n
}
-func (m *Authentication) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.Did)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.Controller)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.Subject)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.PublicKeyHex)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.CredentialId)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- if len(m.Metadata) > 0 {
- for k, v := range m.Metadata {
- _ = k
- _ = v
- mapEntrySize := 1 + len(k) + sovState(uint64(len(k))) + 1 + len(v) + sovState(uint64(len(v)))
- n += mapEntrySize + 1 + sovState(uint64(mapEntrySize))
- }
- }
- if m.CreationBlock != 0 {
- n += 1 + sovState(uint64(m.CreationBlock))
- }
- return n
-}
-
-func (m *Biscuit) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- if m.Id != 0 {
- n += 1 + sovState(uint64(m.Id))
- }
- l = len(m.Controller)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.Subject)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- l = len(m.Origin)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- if m.ExpiryHeight != 0 {
- n += 1 + sovState(uint64(m.ExpiryHeight))
- }
- l = len(m.Macaroon)
- if l > 0 {
- n += 1 + l + sovState(uint64(l))
- }
- return n
-}
-
-func (m *Controller) Size() (n int) {
+func (m *PublicKey) Size() (n int) {
if m == nil {
return 0
}
@@ -1236,7 +827,7 @@ func sovState(x uint64) (n int) {
func sozState(x uint64) (n int) {
return sovState(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
-func (m *Assertion) Unmarshal(dAtA []byte) error {
+func (m *Account) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -1259,10 +850,10 @@ func (m *Assertion) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: Assertion: wiretype end group for non-group")
+ return fmt.Errorf("proto: Account: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: Assertion: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: Account: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -1593,7 +1184,7 @@ func (m *Assertion) Unmarshal(dAtA []byte) error {
}
return nil
}
-func (m *Authentication) Unmarshal(dAtA []byte) error {
+func (m *PublicKey) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -1616,584 +1207,10 @@ func (m *Authentication) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: Authentication: wiretype end group for non-group")
+ return fmt.Errorf("proto: PublicKey: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: Authentication: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Did", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Did = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Controller", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Controller = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Subject = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 4:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PublicKeyHex", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.PublicKeyHex = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 5:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field CredentialId", wireType)
- }
- var byteLen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- byteLen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if byteLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + byteLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.CredentialId = append(m.CredentialId[:0], dAtA[iNdEx:postIndex]...)
- if m.CredentialId == nil {
- m.CredentialId = []byte{}
- }
- iNdEx = postIndex
- case 6:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- msglen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + msglen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if m.Metadata == nil {
- m.Metadata = make(map[string]string)
- }
- var mapkey string
- var mapvalue string
- for iNdEx < postIndex {
- entryPreIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- if fieldNum == 1 {
- var stringLenmapkey uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLenmapkey |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLenmapkey := int(stringLenmapkey)
- if intStringLenmapkey < 0 {
- return ErrInvalidLengthState
- }
- postStringIndexmapkey := iNdEx + intStringLenmapkey
- if postStringIndexmapkey < 0 {
- return ErrInvalidLengthState
- }
- if postStringIndexmapkey > l {
- return io.ErrUnexpectedEOF
- }
- mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
- iNdEx = postStringIndexmapkey
- } else if fieldNum == 2 {
- var stringLenmapvalue uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLenmapvalue |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLenmapvalue := int(stringLenmapvalue)
- if intStringLenmapvalue < 0 {
- return ErrInvalidLengthState
- }
- postStringIndexmapvalue := iNdEx + intStringLenmapvalue
- if postStringIndexmapvalue < 0 {
- return ErrInvalidLengthState
- }
- if postStringIndexmapvalue > l {
- return io.ErrUnexpectedEOF
- }
- mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
- iNdEx = postStringIndexmapvalue
- } else {
- iNdEx = entryPreIndex
- skippy, err := skipState(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if (skippy < 0) || (iNdEx+skippy) < 0 {
- return ErrInvalidLengthState
- }
- if (iNdEx + skippy) > postIndex {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
- m.Metadata[mapkey] = mapvalue
- iNdEx = postIndex
- case 7:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field CreationBlock", wireType)
- }
- m.CreationBlock = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.CreationBlock |= int64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- default:
- iNdEx = preIndex
- skippy, err := skipState(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if (skippy < 0) || (iNdEx+skippy) < 0 {
- return ErrInvalidLengthState
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *Biscuit) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Biscuit: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Biscuit: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
- }
- m.Id = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Id |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Controller", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Controller = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Subject = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 4:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Origin", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Origin = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 5:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType)
- }
- m.ExpiryHeight = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.ExpiryHeight |= int64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 6:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Macaroon", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthState
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthState
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Macaroon = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipState(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if (skippy < 0) || (iNdEx+skippy) < 0 {
- return ErrInvalidLengthState
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *Controller) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowState
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Controller: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Controller: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: PublicKey: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
diff --git a/x/dwn/keeper/orm_test.go b/x/dwn/keeper/orm_test.go
deleted file mode 100644
index de439d2bf..000000000
--- a/x/dwn/keeper/orm_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package keeper_test
-
-import (
- "testing"
-
- apiv1 "github.com/onsonr/sonr/api/dwn/v1"
- "github.com/stretchr/testify/require"
-)
-
-func TestORM(t *testing.T) {
- f := SetupTest(t)
-
- dt := f.k.OrmDB.ExampleDataTable()
- acc := []byte("test_acc")
- amt := uint64(7)
-
- err := dt.Insert(f.ctx, &apiv1.ExampleData{
- Account: acc,
- Amount: amt,
- })
- require.NoError(t, err)
-
- d, err := dt.Has(f.ctx, []byte("test_acc"))
- require.NoError(t, err)
- require.True(t, d)
-
- res, err := dt.Get(f.ctx, []byte("test_acc"))
- require.NoError(t, err)
- require.NotNil(t, res)
- require.EqualValues(t, amt, res.Amount)
-}
diff --git a/x/dwn/types/state.pb.go b/x/dwn/types/state.pb.go
index f3029c324..50a481acf 100644
--- a/x/dwn/types/state.pb.go
+++ b/x/dwn/types/state.pb.go
@@ -23,23 +23,23 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-type ExampleData struct {
+type Credential struct {
Account []byte `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"`
Amount uint64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
}
-func (m *ExampleData) Reset() { *m = ExampleData{} }
-func (m *ExampleData) String() string { return proto.CompactTextString(m) }
-func (*ExampleData) ProtoMessage() {}
-func (*ExampleData) Descriptor() ([]byte, []int) {
+func (m *Credential) Reset() { *m = Credential{} }
+func (m *Credential) String() string { return proto.CompactTextString(m) }
+func (*Credential) ProtoMessage() {}
+func (*Credential) Descriptor() ([]byte, []int) {
return fileDescriptor_040a9b061177db90, []int{0}
}
-func (m *ExampleData) XXX_Unmarshal(b []byte) error {
+func (m *Credential) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *ExampleData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *Credential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_ExampleData.Marshal(b, m, deterministic)
+ return xxx_messageInfo_Credential.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -49,26 +49,78 @@ func (m *ExampleData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return b[:n], nil
}
}
-func (m *ExampleData) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ExampleData.Merge(m, src)
+func (m *Credential) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Credential.Merge(m, src)
}
-func (m *ExampleData) XXX_Size() int {
+func (m *Credential) XXX_Size() int {
return m.Size()
}
-func (m *ExampleData) XXX_DiscardUnknown() {
- xxx_messageInfo_ExampleData.DiscardUnknown(m)
+func (m *Credential) XXX_DiscardUnknown() {
+ xxx_messageInfo_Credential.DiscardUnknown(m)
}
-var xxx_messageInfo_ExampleData proto.InternalMessageInfo
+var xxx_messageInfo_Credential proto.InternalMessageInfo
-func (m *ExampleData) GetAccount() []byte {
+func (m *Credential) GetAccount() []byte {
if m != nil {
return m.Account
}
return nil
}
-func (m *ExampleData) GetAmount() uint64 {
+func (m *Credential) GetAmount() uint64 {
+ if m != nil {
+ return m.Amount
+ }
+ return 0
+}
+
+type Profile struct {
+ Account []byte `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"`
+ Amount uint64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
+}
+
+func (m *Profile) Reset() { *m = Profile{} }
+func (m *Profile) String() string { return proto.CompactTextString(m) }
+func (*Profile) ProtoMessage() {}
+func (*Profile) Descriptor() ([]byte, []int) {
+ return fileDescriptor_040a9b061177db90, []int{1}
+}
+func (m *Profile) XXX_Unmarshal(b []byte) error {
+ return m.Unmarshal(b)
+}
+func (m *Profile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ if deterministic {
+ return xxx_messageInfo_Profile.Marshal(b, m, deterministic)
+ } else {
+ b = b[:cap(b)]
+ n, err := m.MarshalToSizedBuffer(b)
+ if err != nil {
+ return nil, err
+ }
+ return b[:n], nil
+ }
+}
+func (m *Profile) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Profile.Merge(m, src)
+}
+func (m *Profile) XXX_Size() int {
+ return m.Size()
+}
+func (m *Profile) XXX_DiscardUnknown() {
+ xxx_messageInfo_Profile.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Profile proto.InternalMessageInfo
+
+func (m *Profile) GetAccount() []byte {
+ if m != nil {
+ return m.Account
+ }
+ return nil
+}
+
+func (m *Profile) GetAmount() uint64 {
if m != nil {
return m.Amount
}
@@ -76,29 +128,31 @@ func (m *ExampleData) GetAmount() uint64 {
}
func init() {
- proto.RegisterType((*ExampleData)(nil), "dwn.v1.ExampleData")
+ proto.RegisterType((*Credential)(nil), "dwn.v1.Credential")
+ proto.RegisterType((*Profile)(nil), "dwn.v1.Profile")
}
func init() { proto.RegisterFile("dwn/v1/state.proto", fileDescriptor_040a9b061177db90) }
var fileDescriptor_040a9b061177db90 = []byte{
- // 205 bytes of a gzipped FileDescriptorProto
+ // 219 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4a, 0x29, 0xcf, 0xd3,
0x2f, 0x33, 0xd4, 0x2f, 0x2e, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62,
0x4b, 0x29, 0xcf, 0xd3, 0x2b, 0x33, 0x94, 0x12, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0xcf,
- 0x2f, 0xca, 0x05, 0x29, 0xc9, 0x2f, 0xca, 0x85, 0x28, 0x50, 0x4a, 0xe0, 0xe2, 0x76, 0xad, 0x48,
- 0xcc, 0x2d, 0xc8, 0x49, 0x75, 0x49, 0x2c, 0x49, 0x14, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x4e, 0xce,
- 0x2f, 0xcd, 0x2b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0xc4, 0xb8, 0xd8,
- 0x12, 0x73, 0xc1, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x50, 0x9e, 0x95, 0xfc, 0xa7, 0x79,
- 0x97, 0xfb, 0x98, 0x25, 0xb9, 0x38, 0xe1, 0x3a, 0x85, 0xb8, 0x60, 0x4a, 0x05, 0x18, 0x25, 0x18,
- 0x9d, 0x6c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09,
- 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x29, 0x3d, 0xb3,
- 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x3f, 0xaf, 0x38, 0x3f, 0xaf, 0x48, 0x1f,
- 0x4c, 0x54, 0xe8, 0x83, 0x7c, 0x52, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xa6, 0x31,
- 0x20, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x48, 0x77, 0x36, 0xdd, 0x00, 0x00, 0x00,
+ 0x2f, 0xca, 0x05, 0x29, 0xc9, 0x2f, 0xca, 0x85, 0x28, 0x50, 0x8a, 0xe7, 0xe2, 0x72, 0x2e, 0x4a,
+ 0x4d, 0x49, 0xcd, 0x2b, 0xc9, 0x4c, 0xcc, 0x11, 0x92, 0xe0, 0x62, 0x4f, 0x4c, 0x4e, 0xce, 0x2f,
+ 0xcd, 0x2b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0xc4, 0xb8, 0xd8, 0x12,
+ 0x73, 0xc1, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x50, 0x9e, 0x95, 0xfc, 0xa7, 0x79, 0x97,
+ 0xfb, 0x98, 0x25, 0xb9, 0x38, 0xe1, 0x3a, 0x85, 0xb8, 0x60, 0x4a, 0x05, 0x18, 0x25, 0x18, 0x95,
+ 0x62, 0xb8, 0xd8, 0x03, 0x8a, 0xf2, 0xd3, 0x32, 0x73, 0x52, 0xa9, 0x6f, 0x3a, 0x93, 0x93, 0xcd,
+ 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c,
+ 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x29, 0xa5, 0x67, 0x96, 0x64, 0x94,
+ 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0xe7, 0x15, 0xe7, 0xe7, 0x15, 0xe9, 0x83, 0x89, 0x0a,
+ 0x7d, 0x50, 0x30, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xc3, 0xc0, 0x18, 0x10, 0x00,
+ 0x00, 0xff, 0xff, 0x14, 0x0b, 0x56, 0x1c, 0x3a, 0x01, 0x00, 0x00,
}
-func (m *ExampleData) Marshal() (dAtA []byte, err error) {
+func (m *Credential) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -108,12 +162,47 @@ func (m *ExampleData) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *ExampleData) MarshalTo(dAtA []byte) (int, error) {
+func (m *Credential) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *ExampleData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *Credential) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ _ = i
+ var l int
+ _ = l
+ if m.Amount != 0 {
+ i = encodeVarintState(dAtA, i, uint64(m.Amount))
+ i--
+ dAtA[i] = 0x10
+ }
+ if len(m.Account) > 0 {
+ i -= len(m.Account)
+ copy(dAtA[i:], m.Account)
+ i = encodeVarintState(dAtA, i, uint64(len(m.Account)))
+ i--
+ dAtA[i] = 0xa
+ }
+ return len(dAtA) - i, nil
+}
+
+func (m *Profile) Marshal() (dAtA []byte, err error) {
+ size := m.Size()
+ dAtA = make([]byte, size)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
+ if err != nil {
+ return nil, err
+ }
+ return dAtA[:n], nil
+}
+
+func (m *Profile) MarshalTo(dAtA []byte) (int, error) {
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Profile) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -144,7 +233,23 @@ func encodeVarintState(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
return base
}
-func (m *ExampleData) Size() (n int) {
+func (m *Credential) Size() (n int) {
+ if m == nil {
+ return 0
+ }
+ var l int
+ _ = l
+ l = len(m.Account)
+ if l > 0 {
+ n += 1 + l + sovState(uint64(l))
+ }
+ if m.Amount != 0 {
+ n += 1 + sovState(uint64(m.Amount))
+ }
+ return n
+}
+
+func (m *Profile) Size() (n int) {
if m == nil {
return 0
}
@@ -166,7 +271,7 @@ func sovState(x uint64) (n int) {
func sozState(x uint64) (n int) {
return sovState(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
-func (m *ExampleData) Unmarshal(dAtA []byte) error {
+func (m *Credential) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -189,10 +294,113 @@ func (m *ExampleData) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: ExampleData: wiretype end group for non-group")
+ return fmt.Errorf("proto: Credential: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: ExampleData: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: Credential: illegal tag %d (wire type %d)", fieldNum, wire)
+ }
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowState
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthState
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthState
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Account = append(m.Account[:0], dAtA[iNdEx:postIndex]...)
+ if m.Account == nil {
+ m.Account = []byte{}
+ }
+ iNdEx = postIndex
+ case 2:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+ }
+ m.Amount = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowState
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Amount |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ default:
+ iNdEx = preIndex
+ skippy, err := skipState(dAtA[iNdEx:])
+ if err != nil {
+ return err
+ }
+ if (skippy < 0) || (iNdEx+skippy) < 0 {
+ return ErrInvalidLengthState
+ }
+ if (iNdEx + skippy) > l {
+ return io.ErrUnexpectedEOF
+ }
+ iNdEx += skippy
+ }
+ }
+
+ if iNdEx > l {
+ return io.ErrUnexpectedEOF
+ }
+ return nil
+}
+func (m *Profile) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
+ iNdEx := 0
+ for iNdEx < l {
+ preIndex := iNdEx
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowState
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ wire |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ fieldNum := int32(wire >> 3)
+ wireType := int(wire & 0x7)
+ if wireType == 4 {
+ return fmt.Errorf("proto: Profile: wiretype end group for non-group")
+ }
+ if fieldNum <= 0 {
+ return fmt.Errorf("proto: Profile: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
diff --git a/x/svc/types/state.pb.go b/x/svc/types/state.pb.go
index a7e9ac963..e7f9e4f88 100644
--- a/x/svc/types/state.pb.go
+++ b/x/svc/types/state.pb.go
@@ -23,7 +23,7 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-type Metadata struct {
+type Domain struct {
Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
Origin string `protobuf:"bytes,2,opt,name=origin,proto3" json:"origin,omitempty"`
Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
@@ -33,11 +33,105 @@ type Metadata struct {
Tags []string `protobuf:"bytes,7,rep,name=tags,proto3" json:"tags,omitempty"`
}
+func (m *Domain) Reset() { *m = Domain{} }
+func (m *Domain) String() string { return proto.CompactTextString(m) }
+func (*Domain) ProtoMessage() {}
+func (*Domain) Descriptor() ([]byte, []int) {
+ return fileDescriptor_2859adb306f7c51f, []int{0}
+}
+func (m *Domain) XXX_Unmarshal(b []byte) error {
+ return m.Unmarshal(b)
+}
+func (m *Domain) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ if deterministic {
+ return xxx_messageInfo_Domain.Marshal(b, m, deterministic)
+ } else {
+ b = b[:cap(b)]
+ n, err := m.MarshalToSizedBuffer(b)
+ if err != nil {
+ return nil, err
+ }
+ return b[:n], nil
+ }
+}
+func (m *Domain) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Domain.Merge(m, src)
+}
+func (m *Domain) XXX_Size() int {
+ return m.Size()
+}
+func (m *Domain) XXX_DiscardUnknown() {
+ xxx_messageInfo_Domain.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Domain proto.InternalMessageInfo
+
+func (m *Domain) GetId() uint64 {
+ if m != nil {
+ return m.Id
+ }
+ return 0
+}
+
+func (m *Domain) GetOrigin() string {
+ if m != nil {
+ return m.Origin
+ }
+ return ""
+}
+
+func (m *Domain) GetName() string {
+ if m != nil {
+ return m.Name
+ }
+ return ""
+}
+
+func (m *Domain) GetDescription() string {
+ if m != nil {
+ return m.Description
+ }
+ return ""
+}
+
+func (m *Domain) GetCategory() string {
+ if m != nil {
+ return m.Category
+ }
+ return ""
+}
+
+func (m *Domain) GetIcon() string {
+ if m != nil {
+ return m.Icon
+ }
+ return ""
+}
+
+func (m *Domain) GetTags() []string {
+ if m != nil {
+ return m.Tags
+ }
+ return nil
+}
+
+// Metadata represents a DID alias
+type Metadata struct {
+ // The unique identifier of the alias
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ // The alias of the DID
+ Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
+ // Origin of the alias
+ Origin string `protobuf:"bytes,3,opt,name=origin,proto3" json:"origin,omitempty"`
+ // Controller of the alias
+ Controller string `protobuf:"bytes,4,opt,name=controller,proto3" json:"controller,omitempty"`
+}
+
func (m *Metadata) Reset() { *m = Metadata{} }
func (m *Metadata) String() string { return proto.CompactTextString(m) }
func (*Metadata) ProtoMessage() {}
func (*Metadata) Descriptor() ([]byte, []int) {
- return fileDescriptor_2859adb306f7c51f, []int{0}
+ return fileDescriptor_2859adb306f7c51f, []int{1}
}
func (m *Metadata) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -66,11 +160,18 @@ func (m *Metadata) XXX_DiscardUnknown() {
var xxx_messageInfo_Metadata proto.InternalMessageInfo
-func (m *Metadata) GetId() uint64 {
+func (m *Metadata) GetId() string {
if m != nil {
return m.Id
}
- return 0
+ return ""
+}
+
+func (m *Metadata) GetSubject() string {
+ if m != nil {
+ return m.Subject
+ }
+ return ""
}
func (m *Metadata) GetOrigin() string {
@@ -80,108 +181,7 @@ func (m *Metadata) GetOrigin() string {
return ""
}
-func (m *Metadata) GetName() string {
- if m != nil {
- return m.Name
- }
- return ""
-}
-
-func (m *Metadata) GetDescription() string {
- if m != nil {
- return m.Description
- }
- return ""
-}
-
-func (m *Metadata) GetCategory() string {
- if m != nil {
- return m.Category
- }
- return ""
-}
-
-func (m *Metadata) GetIcon() string {
- if m != nil {
- return m.Icon
- }
- return ""
-}
-
-func (m *Metadata) GetTags() []string {
- if m != nil {
- return m.Tags
- }
- return nil
-}
-
-// Profile represents a DID alias
-type Profile struct {
- // The unique identifier of the alias
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- // The alias of the DID
- Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
- // Origin of the alias
- Origin string `protobuf:"bytes,3,opt,name=origin,proto3" json:"origin,omitempty"`
- // Controller of the alias
- Controller string `protobuf:"bytes,4,opt,name=controller,proto3" json:"controller,omitempty"`
-}
-
-func (m *Profile) Reset() { *m = Profile{} }
-func (m *Profile) String() string { return proto.CompactTextString(m) }
-func (*Profile) ProtoMessage() {}
-func (*Profile) Descriptor() ([]byte, []int) {
- return fileDescriptor_2859adb306f7c51f, []int{1}
-}
-func (m *Profile) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Profile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Profile.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalToSizedBuffer(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Profile) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Profile.Merge(m, src)
-}
-func (m *Profile) XXX_Size() int {
- return m.Size()
-}
-func (m *Profile) XXX_DiscardUnknown() {
- xxx_messageInfo_Profile.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Profile proto.InternalMessageInfo
-
-func (m *Profile) GetId() string {
- if m != nil {
- return m.Id
- }
- return ""
-}
-
-func (m *Profile) GetSubject() string {
- if m != nil {
- return m.Subject
- }
- return ""
-}
-
-func (m *Profile) GetOrigin() string {
- if m != nil {
- return m.Origin
- }
- return ""
-}
-
-func (m *Profile) GetController() string {
+func (m *Metadata) GetController() string {
if m != nil {
return m.Controller
}
@@ -189,39 +189,39 @@ func (m *Profile) GetController() string {
}
func init() {
+ proto.RegisterType((*Domain)(nil), "svc.v1.Domain")
proto.RegisterType((*Metadata)(nil), "svc.v1.Metadata")
- proto.RegisterType((*Profile)(nil), "svc.v1.Profile")
}
func init() { proto.RegisterFile("svc/v1/state.proto", fileDescriptor_2859adb306f7c51f) }
var fileDescriptor_2859adb306f7c51f = []byte{
- // 343 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x4a, 0x3b, 0x31,
- 0x10, 0xc6, 0x9b, 0xdd, 0xfd, 0x6f, 0xdb, 0xfc, 0xa5, 0x94, 0x20, 0x1a, 0x7a, 0x08, 0x4b, 0xf1,
- 0xd0, 0x83, 0x74, 0x29, 0xde, 0x8a, 0x27, 0xef, 0x82, 0xf4, 0xe8, 0x6d, 0x9b, 0x8d, 0x6b, 0xa4,
- 0x9b, 0x29, 0x49, 0xba, 0xd8, 0x97, 0x10, 0x7d, 0x01, 0x9f, 0xc7, 0x83, 0x87, 0x82, 0x17, 0x8f,
- 0xd2, 0xbe, 0x81, 0x4f, 0x20, 0x49, 0xb7, 0xb2, 0x5e, 0xc2, 0xcc, 0x37, 0xc3, 0x97, 0xef, 0xc7,
- 0x60, 0x62, 0x2a, 0x9e, 0x56, 0x93, 0xd4, 0xd8, 0xcc, 0x8a, 0xf1, 0x52, 0x83, 0x05, 0x12, 0x9b,
- 0x8a, 0x8f, 0xab, 0xc9, 0xe0, 0x94, 0x83, 0x29, 0xc1, 0xa4, 0xa0, 0x4b, 0xb7, 0x02, 0xba, 0xdc,
- 0x2f, 0x0c, 0xdf, 0x11, 0xee, 0x5c, 0x0b, 0x9b, 0xe5, 0x99, 0xcd, 0x48, 0x0f, 0x07, 0x32, 0xa7,
- 0x28, 0x41, 0xa3, 0x68, 0x16, 0xc8, 0x9c, 0x9c, 0xe0, 0x18, 0xb4, 0x2c, 0xa4, 0xa2, 0x41, 0x82,
- 0x46, 0xdd, 0x59, 0xdd, 0x11, 0x82, 0x23, 0x95, 0x95, 0x82, 0x86, 0x5e, 0xf5, 0x35, 0x49, 0xf0,
- 0xff, 0x5c, 0x18, 0xae, 0xe5, 0xd2, 0x4a, 0x50, 0x34, 0xf2, 0xa3, 0xa6, 0x44, 0x06, 0xb8, 0xc3,
- 0x33, 0x2b, 0x0a, 0xd0, 0x6b, 0xfa, 0xcf, 0x8f, 0x7f, 0x7b, 0xe7, 0x28, 0x39, 0x28, 0x1a, 0xef,
- 0x1d, 0x5d, 0xed, 0x34, 0x9b, 0x15, 0x86, 0xb6, 0x93, 0xd0, 0x69, 0xae, 0x9e, 0xb2, 0xef, 0xd7,
- 0x8f, 0xa7, 0x90, 0xe2, 0xd8, 0x25, 0xed, 0x23, 0x72, 0x74, 0x48, 0xd8, 0x47, 0x14, 0x51, 0x34,
- 0x7c, 0x41, 0xb8, 0x7d, 0xa3, 0xe1, 0x4e, 0x2e, 0x44, 0x83, 0xa6, 0xeb, 0x69, 0x28, 0x6e, 0x9b,
- 0xd5, 0xfc, 0x41, 0x70, 0x5b, 0xe3, 0x1c, 0xda, 0x06, 0x67, 0xf8, 0x87, 0x93, 0x61, 0xcc, 0x41,
- 0x59, 0x0d, 0x8b, 0x85, 0xd0, 0x35, 0x52, 0x43, 0x99, 0x9e, 0xf9, 0x34, 0x0c, 0x47, 0xee, 0x27,
- 0x72, 0x8c, 0x7b, 0xb5, 0xe1, 0x79, 0x23, 0x53, 0x70, 0x75, 0xf9, 0xb6, 0x65, 0x68, 0xb3, 0x65,
- 0xe8, 0x6b, 0xcb, 0xd0, 0xf3, 0x8e, 0xb5, 0x36, 0x3b, 0xd6, 0xfa, 0xdc, 0xb1, 0xd6, 0xed, 0xb0,
- 0x90, 0xf6, 0x7e, 0x35, 0x1f, 0x73, 0x28, 0x53, 0x50, 0x06, 0x94, 0x4e, 0xfd, 0xf3, 0x98, 0xba,
- 0x53, 0xda, 0xf5, 0x52, 0x98, 0x79, 0xec, 0xef, 0x74, 0xf1, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd0,
- 0x82, 0x18, 0x99, 0xde, 0x01, 0x00, 0x00,
+ // 344 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xb1, 0x6a, 0x23, 0x31,
+ 0x10, 0x86, 0xad, 0xdd, 0xbd, 0xb5, 0xad, 0x3b, 0x8c, 0x11, 0xc7, 0x9d, 0x70, 0x21, 0x16, 0x73,
+ 0x85, 0x8b, 0xc3, 0x8b, 0x49, 0x67, 0x52, 0x85, 0xb4, 0x69, 0x5c, 0xa6, 0x93, 0xb5, 0x62, 0xa3,
+ 0xe0, 0xd5, 0x18, 0x49, 0x5e, 0xe2, 0x97, 0x08, 0x21, 0x0f, 0x90, 0xe7, 0x09, 0xa9, 0x0c, 0x69,
+ 0x52, 0x06, 0xfb, 0x0d, 0xf2, 0x04, 0x41, 0xf2, 0x3a, 0x6c, 0x1a, 0x31, 0xf3, 0xcf, 0xf0, 0xeb,
+ 0xff, 0x18, 0x4c, 0x6c, 0x2d, 0xf2, 0x7a, 0x96, 0x5b, 0xc7, 0x9d, 0x9c, 0xae, 0x0d, 0x38, 0x20,
+ 0xa9, 0xad, 0xc5, 0xb4, 0x9e, 0x8d, 0xfe, 0x0a, 0xb0, 0x15, 0xd8, 0x1c, 0x4c, 0xe5, 0x57, 0xc0,
+ 0x54, 0xc7, 0x85, 0xf1, 0x0b, 0xc2, 0xe9, 0x25, 0x54, 0x5c, 0x69, 0x32, 0xc0, 0x91, 0x2a, 0x28,
+ 0xca, 0xd0, 0x24, 0x59, 0x44, 0xaa, 0x20, 0x7f, 0x70, 0x0a, 0x46, 0x95, 0x4a, 0xd3, 0x28, 0x43,
+ 0x93, 0xfe, 0xa2, 0xe9, 0x08, 0xc1, 0x89, 0xe6, 0x95, 0xa4, 0x71, 0x50, 0x43, 0x4d, 0x32, 0xfc,
+ 0xb3, 0x90, 0x56, 0x18, 0xb5, 0x76, 0x0a, 0x34, 0x4d, 0xc2, 0xa8, 0x2d, 0x91, 0x11, 0xee, 0x09,
+ 0xee, 0x64, 0x09, 0x66, 0x4b, 0x7f, 0x84, 0xf1, 0x57, 0xef, 0x1d, 0x95, 0x00, 0x4d, 0xd3, 0xa3,
+ 0xa3, 0xaf, 0xbd, 0xe6, 0x78, 0x69, 0x69, 0x37, 0x8b, 0xbd, 0xe6, 0xeb, 0x39, 0xfb, 0x78, 0x7a,
+ 0xbd, 0x8f, 0x29, 0x4e, 0x7d, 0xd2, 0x21, 0x22, 0xbf, 0x4e, 0x09, 0x87, 0x88, 0x22, 0x8a, 0xc6,
+ 0x8f, 0x08, 0xf7, 0xae, 0xa4, 0xe3, 0x05, 0x77, 0xbc, 0x85, 0xd3, 0x0f, 0x38, 0x14, 0x77, 0xed,
+ 0x66, 0x79, 0x2b, 0x85, 0x6b, 0x78, 0x4e, 0x6d, 0x0b, 0x34, 0xfe, 0x06, 0xca, 0x30, 0x16, 0xa0,
+ 0x9d, 0x81, 0xd5, 0x4a, 0x9a, 0x86, 0xa9, 0xa5, 0xcc, 0xff, 0x85, 0x38, 0x0c, 0x27, 0xfe, 0x27,
+ 0xf2, 0x1b, 0x0f, 0x1a, 0xc3, 0xff, 0xad, 0x50, 0xd1, 0xc5, 0xf9, 0xf3, 0x9e, 0xa1, 0xdd, 0x9e,
+ 0xa1, 0xf7, 0x3d, 0x43, 0x0f, 0x07, 0xd6, 0xd9, 0x1d, 0x58, 0xe7, 0xed, 0xc0, 0x3a, 0xd7, 0xe3,
+ 0x52, 0xb9, 0x9b, 0xcd, 0x72, 0x2a, 0xa0, 0xca, 0x41, 0x5b, 0xd0, 0x26, 0x0f, 0xcf, 0x5d, 0xee,
+ 0x2f, 0xe9, 0xb6, 0x6b, 0x69, 0x97, 0x69, 0x38, 0xd3, 0xd9, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff,
+ 0x13, 0x81, 0x47, 0xf4, 0xdd, 0x01, 0x00, 0x00,
}
-func (m *Metadata) Marshal() (dAtA []byte, err error) {
+func (m *Domain) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -231,12 +231,12 @@ func (m *Metadata) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *Metadata) MarshalTo(dAtA []byte) (int, error) {
+func (m *Domain) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *Metadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *Domain) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -293,7 +293,7 @@ func (m *Metadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
-func (m *Profile) Marshal() (dAtA []byte, err error) {
+func (m *Metadata) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -303,12 +303,12 @@ func (m *Profile) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *Profile) MarshalTo(dAtA []byte) (int, error) {
+func (m *Metadata) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *Profile) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *Metadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -355,7 +355,7 @@ func encodeVarintState(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
return base
}
-func (m *Metadata) Size() (n int) {
+func (m *Domain) Size() (n int) {
if m == nil {
return 0
}
@@ -393,7 +393,7 @@ func (m *Metadata) Size() (n int) {
return n
}
-func (m *Profile) Size() (n int) {
+func (m *Metadata) Size() (n int) {
if m == nil {
return 0
}
@@ -424,7 +424,7 @@ func sovState(x uint64) (n int) {
func sozState(x uint64) (n int) {
return sovState(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
-func (m *Metadata) Unmarshal(dAtA []byte) error {
+func (m *Domain) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -447,10 +447,10 @@ func (m *Metadata) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: Metadata: wiretype end group for non-group")
+ return fmt.Errorf("proto: Domain: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: Metadata: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: Domain: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -685,7 +685,7 @@ func (m *Metadata) Unmarshal(dAtA []byte) error {
}
return nil
}
-func (m *Profile) Unmarshal(dAtA []byte) error {
+func (m *Metadata) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -708,10 +708,10 @@ func (m *Profile) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: Profile: wiretype end group for non-group")
+ return fmt.Errorf("proto: Metadata: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: Profile: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: Metadata: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1: