Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added verify uniqueID of certificate #542

Merged
merged 28 commits into from
Dec 12, 2022
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
34d058b
feat: add skeleton code for datadeal module
inchori Dec 6, 2022
6b17689
fix
inchori Dec 6, 2022
351464b
fix
inchori Dec 7, 2022
22b7b59
feat: add create a Deal and query a Deal keeper function
inchori Dec 7, 2022
ff05626
rename
inchori Dec 7, 2022
b1702dc
Merge branch 'ft/na/skeleton_code_datadeal' into ft/512/create_deal_k…
inchori Dec 7, 2022
a5397f1
fix
inchori Dec 7, 2022
6fea92d
Merge branch 'ft/na/skeleton_code_datadeal' into ft/512/create_deal_k…
inchori Dec 7, 2022
2c2b906
fix
inchori Dec 7, 2022
b0bdaa8
Merge branch 'main' into ft/512/create_deal_keeper
inchori Dec 7, 2022
b075d85
rename
inchori Dec 7, 2022
e2fad75
feat: implement submit consent
gyuguen Dec 7, 2022
6306f89
fix
gyuguen Dec 8, 2022
d498a81
fix
gyuguen Dec 8, 2022
100d34d
fix
gyuguen Dec 8, 2022
26101ad
fix
gyuguen Dec 8, 2022
ee93f66
Merge branch 'main' into ft/513/implement_submit_consent
gyuguen Dec 8, 2022
f3be8e1
fix
gyuguen Dec 8, 2022
47d1350
fix
gyuguen Dec 8, 2022
97a018a
feat: apply oracle commission
gyuguen Dec 8, 2022
fec02e4
fix
gyuguen Dec 8, 2022
7009804
feat: added verify uniqueID of certificate
gyuguen Dec 8, 2022
d1b14ce
Merge branch 'ft/513/implement_submit_consent' into ft/513/apply_orac…
gyuguen Dec 8, 2022
cfba717
Merge branch 'ft/513/apply_oracle_commission' into ft/513/add_verify_…
gyuguen Dec 8, 2022
88a34c1
added test code
gyuguen Dec 9, 2022
64000e3
fix
gyuguen Dec 9, 2022
8264255
Merge branch 'ft/513/apply_oracle_commission' into ft/513/add_verify_…
gyuguen Dec 9, 2022
1adee16
Merge branch 'main' into ft/513/add_verify_unique_id_of_certificate
gyuguen Dec 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,19 +434,20 @@ func New(
app.BankKeeper,
)

app.oracleKeeper = *oraclekeeper.NewKeeper(
appCodec,
keys[oracletypes.StoreKey],
keys[oracletypes.MemStoreKey],
app.GetSubspace(oracletypes.ModuleName),
)

app.datadealKeeper = *datadealkeeper.NewKeeper(
appCodec,
keys[datadealtypes.StoreKey],
keys[datadealtypes.MemStoreKey],
app.AccountKeeper,
app.BankKeeper,
)

app.oracleKeeper = *oraclekeeper.NewKeeper(
appCodec,
keys[oracletypes.StoreKey],
keys[oracletypes.MemStoreKey],
app.GetSubspace(oracletypes.ModuleName),
app.oracleKeeper,
)

wasmDir := filepath.Join(homePath, wasm.ModuleName)
Expand Down
9 changes: 5 additions & 4 deletions proto/panacea/datadeal/v2/certificate.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ message Certificate {
// UnsignedCertificate defines a certificate information
message UnsignedCertificate {
string cid = 1;
string oracle_address = 2;
int64 deal_id = 3;
string provider_address = 4;
string data_hash = 5;
string unique_id = 2;
string oracle_address = 3;
uint64 deal_id = 4;
string provider_address = 5;
string data_hash = 6;
}
2 changes: 1 addition & 1 deletion proto/panacea/datadeal/v2/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ message QueryDealResponse {

// QueryDealsRequest defines the request type for the Query/Deals RPC method.
message QueryCertificates {
int64 deal_id = 1;
uint64 deal_id = 1;
cosmos.base.query.v1beta1.PageRequest pagination = 2;
}

Expand Down
15 changes: 8 additions & 7 deletions types/testsuite/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,22 +213,23 @@ func (suite *TestSuite) SetupTest() {
)
suite.DIDMsgServer = didkeeper.NewMsgServerImpl(suite.DIDKeeper)

suite.OracleKeeper = *oraclekeeper.NewKeeper(
cdc.Marshaler,
keyParams[oracletypes.StoreKey],
memKeys[oracletypes.MemStoreKey],
paramsKeeper.Subspace(oracletypes.ModuleName),
)

suite.DataDealKeeper = *datadealkeeper.NewKeeper(
cdc.Marshaler,
keyParams[datadealtypes.StoreKey],
memKeys[datadealtypes.MemStoreKey],
suite.AccountKeeper,
suite.BankKeeper,
suite.OracleKeeper,
)
suite.DataDealMsgServer = datadealkeeper.NewMsgServerImpl(suite.DataDealKeeper)

suite.OracleKeeper = *oraclekeeper.NewKeeper(
cdc.Marshaler,
keyParams[oracletypes.StoreKey],
memKeys[oracletypes.MemStoreKey],
paramsKeeper.Subspace(oracletypes.ModuleName),
)

suite.OracleMsgServer = oraclekeeper.NewMsgServerImpl(suite.OracleKeeper)
}

Expand Down
6 changes: 3 additions & 3 deletions x/datadeal/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
//case *types.MsgDeactivateDeal:
// res, err := msgServer.DeactivateDeal(sdk.WrapSDKContext(ctx), msg)
// return sdk.WrapServiceResult(ctx, res, err)
//case *types.MsgSubmitConsent:
// res, err := msgServer.SubmitConsent(sdk.WrapSDKContext(ctx), msg)
// return sdk.WrapServiceResult(ctx, res, err)
case *types.MsgSubmitConsent:
res, err := msgServer.SubmitConsent(sdk.WrapSDKContext(ctx), msg)
return sdk.WrapServiceResult(ctx, res, err)
default:
errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg)
return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
Expand Down
148 changes: 148 additions & 0 deletions x/datadeal/keeper/certificate.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
package keeper

import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/medibloc/panacea-core/v2/types/assets"
"github.com/medibloc/panacea-core/v2/x/datadeal/types"
)

func (k Keeper) SubmitConsent(ctx sdk.Context, cert *types.Certificate) error {
unsignedCert := cert.UnsignedCertificate
if err := k.oracleKeeper.VerifyOracleSignature(ctx, unsignedCert, cert.Signature); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

if err := k.oracleKeeper.VerifyOracle(ctx, unsignedCert.OracleAddress); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

deal, err := k.GetDeal(ctx, unsignedCert.DealId)
if err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, "failed to get deal. %v", err)
} else if deal.Status != types.DEAL_STATUS_ACTIVE {
return sdkerrors.Wrapf(types.ErrSubmitConsent, "deal status is not ACTIVE")
}

if err := k.verifyUnsignedCertificate(ctx, unsignedCert); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

if err := k.SetCertificate(ctx, cert); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

if err := k.sendReward(ctx, deal, unsignedCert); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

if err := k.postProcessingOfDeal(ctx, deal); err != nil {
return sdkerrors.Wrapf(types.ErrSubmitConsent, err.Error())
}

return nil
}

func (k Keeper) verifyUnsignedCertificate(ctx sdk.Context, unsignedCert *types.UnsignedCertificate) error {
activeUniqueID := k.oracleKeeper.GetParams(ctx).UniqueId
if activeUniqueID != unsignedCert.UniqueId {
return fmt.Errorf("does not match active uniqueID. certificateUniqueID(%s) activeUniqueID(%s)", unsignedCert.UniqueId, activeUniqueID)
}

if k.isProvidedCertificate(ctx, unsignedCert.DealId, unsignedCert.DataHash) {
return fmt.Errorf("already provided certificate")
}
return nil
}

func (k Keeper) isProvidedCertificate(ctx sdk.Context, dealID uint64, dataHash string) bool {
store := ctx.KVStore(k.storeKey)
return store.Has(types.GetCertificateKey(dealID, dataHash))
}

func (k Keeper) sendReward(ctx sdk.Context, deal *types.Deal, unsignedCert *types.UnsignedCertificate) error {
dealAccAddr, err := sdk.AccAddressFromBech32(deal.GetAddress())
if err != nil {
return err
}

providerAccAddr, err := sdk.AccAddressFromBech32(unsignedCert.ProviderAddress)
if err != nil {
return err
}

pricePerData := deal.GetPricePerData()

dealBalance := k.bankKeeper.GetBalance(ctx, dealAccAddr, assets.MicroMedDenom)
if dealBalance.IsLT(sdk.NewCoin(assets.MicroMedDenom, pricePerData.TruncateInt())) {
return fmt.Errorf("not enough balance in deal")
}

oracle, err := k.oracleKeeper.GetOracle(ctx, unsignedCert.OracleAddress)
if err != nil {
return fmt.Errorf("failed to get oracle. %w", err)
}
oracleCommissionRate := oracle.OracleCommissionRate

oracleReward := sdk.NewCoin(assets.MicroMedDenom, pricePerData.Mul(oracleCommissionRate).TruncateInt())
providerReward := sdk.NewCoin(assets.MicroMedDenom, pricePerData.Mul(sdk.OneDec().Sub(oracleCommissionRate)).TruncateInt())
if err := k.bankKeeper.SendCoins(ctx, dealAccAddr, providerAccAddr, sdk.NewCoins(providerReward)); err != nil {
return fmt.Errorf("failed to send reward to provider. %w", err)
}

// We already do oracle address verification above.
oracleAccAddr, _ := sdk.AccAddressFromBech32(unsignedCert.OracleAddress)
if err := k.bankKeeper.SendCoins(ctx, dealAccAddr, oracleAccAddr, sdk.NewCoins(oracleReward)); err != nil {
return fmt.Errorf("failed to send reward to oracle. %w", err)
}
return nil
}

func (k Keeper) postProcessingOfDeal(ctx sdk.Context, deal *types.Deal) error {
deal.IncreaseCurNumData()

if deal.CurNumData == deal.MaxNumData {
deal.Status = types.DEAL_STATUS_COMPLETED
}

if err := k.SetDeal(ctx, deal); err != nil {
return fmt.Errorf("failed to set deal. %w", err)
}
return nil
}

func (k Keeper) SetCertificate(ctx sdk.Context, cert *types.Certificate) error {
store := ctx.KVStore(k.storeKey)
key := types.GetCertificateKey(cert.UnsignedCertificate.DealId, cert.UnsignedCertificate.DataHash)

bz, err := k.cdc.MarshalLengthPrefixed(cert)

if err != nil {
return err
}

store.Set(key, bz)

return nil
}

func (k Keeper) GetCertificate(ctx sdk.Context, dealID uint64, dataHash string) (*types.Certificate, error) {
store := ctx.KVStore(k.storeKey)
key := types.GetCertificateKey(dealID, dataHash)

bz := store.Get(key)
if bz == nil {
return nil, types.ErrCertificateNotFound
}

certificate := &types.Certificate{}

err := k.cdc.UnmarshalLengthPrefixed(bz, certificate)
if err != nil {
return nil, sdkerrors.Wrapf(types.ErrGetCertificate, err.Error())
}

return certificate, nil
}
Loading