go/sonr
1
0
Fork 0
mirror of https://github.com/sonr-io/sonr.git synced 2026-08-04 10:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use RawPublicKey instead of PublicKey in macaroon issuer

Browse Source
This commit is contained in:
Prad Nukala
2024-10-18 14:09:16 -04:00
parent 6da6f2b97b
commit a0a5f0c7e0
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/vault/keeper/assembly.go
+2 -6
View File
@@ -10,7 +10,7 @@ import (
)
// assembleVault assembles the initial vault
func (k Keeper) assembleVault(cotx sdk.Context) (string, int64, error) {
func (k Keeper) assembleVault(cotx sdk.Context, schema *dwngen.Schema) (string, int64, error) {
_, con, err := k.DIDKeeper.NewController(cotx)
if err != nil {
return "", 0, err
@@ -19,11 +19,7 @@ func (k Keeper) assembleVault(cotx sdk.Context) (string, int64, error) {
if err != nil {
return "", 0, err
}
sch, err := k.currentSchema(cotx)
if err != nil {
return "", 0, err
}
v, err := types.NewVault(usrKs, con.SonrAddress(), con.ChainID(), sch)
v, err := types.NewVault(usrKs, con.SonrAddress(), con.ChainID(), schema)
if err != nil {
return "", 0, err
}
x/vault/keeper/querier.go
+9 -3
View File
@@ -53,10 +53,16 @@ func (k Querier) Schema(goCtx context.Context, req *types.QuerySchemaRequest) (*
func (k Querier) Allocate(goCtx context.Context, req *types.AllocateRequest) (*types.AllocateResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)
// 2.Allocate the vault msg.GetSubject(), msg.GetOrigin()
cid, expiryBlock, err := k.assembleVault(ctx)
// 1. Get current schema
sch, err := k.currentSchema(ctx)
if err != nil {
return nil, err
return nil, types.ErrInvalidSchema.Wrap(err.Error())
}
// 2.Allocate the vault msg.GetSubject(), msg.GetOrigin()
cid, expiryBlock, err := k.assembleVault(ctx, sch)
if err != nil {
return nil, types.ErrVaultAssembly.Wrap(err.Error())
}
return &types.AllocateResponse{
x/vault/types/errors.go
+5 -3
View File
@@ -4,7 +4,9 @@ import sdkerrors "cosmossdk.io/errors"
var (
ErrInvalidGenesisState = sdkerrors.Register(ModuleName, 100, "invalid genesis state")
ErrUnsupportedKeyEncoding = sdkerrors.Register(ModuleName, 200, "unsupported key encoding")
ErrUnsopportedChainCode = sdkerrors.Register(ModuleName, 201, "unsupported chain code")
ErrUnsupportedKeyCurve = sdkerrors.Register(ModuleName, 202, "unsupported key curve")
ErrInvalidSchema = sdkerrors.Register(ModuleName, 200, "invalid schema")
ErrVaultAssembly = sdkerrors.Register(ModuleName, 201, "vault assembly")
ErrUnsupportedKeyEncoding = sdkerrors.Register(ModuleName, 300, "unsupported key encoding")
ErrUnsopportedChainCode = sdkerrors.Register(ModuleName, 301, "unsupported chain code")
ErrUnsupportedKeyCurve = sdkerrors.Register(ModuleName, 302, "unsupported key curve")
)