Update owner checks to use metadata rather than just state (#156)

Author: jeffyanta

ocp/rpc/currency/launch.go

@@ -90,12 +90,14 @@ func (s *currencyServer) Launch(ctx context.Context, req *currencypb.LaunchReque
 		}
 	}
 
-	ownerManagementState, err := common.GetOwnerManagementState(ctx, s.data, ownerAccount)
-	if err != nil {
-		log.With(zap.Error(err)).Warn("failure getting owner management state")
+	ownerMetadata, err := common.GetOwnerMetadata(ctx, s.data, ownerAccount)
+	if err == common.ErrOwnerNotFound {
+		return &currencypb.LaunchResponse{Result: currencypb.LaunchResponse_DENIED}, nil
+	} else if err != nil {
+		log.With(zap.Error(err)).Warn("failure getting owner metadata")
 		return &currencypb.LaunchResponse{Result: currencypb.LaunchResponse_DENIED}, nil
 	}
-	if ownerManagementState != common.OwnerManagementStateOcpAccount {
+	if ownerMetadata.Type != common.OwnerTypeUser12Words || ownerMetadata.State != common.OwnerManagementStateOcpAccount {
 		return &currencypb.LaunchResponse{Result: currencypb.LaunchResponse_DENIED}, nil
 	}
 

ocp/rpc/transaction/swap.go

@@ -104,14 +104,19 @@ func (s *transactionServer) StatefulSwap(streamer transactionpb.Transaction_Stat
 	// Section: Antispam
 	//
 
-	ownerManagemntState, err := common.GetOwnerManagementState(ctx, s.data, owner)
-	if err != nil {
-		log.With(zap.Error(err)).Warn("failure getting owner management state")
+	ownerMetadata, err := common.GetOwnerMetadata(ctx, s.data, owner)
+	if err == common.ErrOwnerNotFound {
+		return handleStatefulSwapError(streamer, NewSwapDeniedError("not an ocp account"))
+	} else if err != nil {
+		log.With(zap.Error(err)).Warn("failure getting owner metadata")
 		return handleStatefulSwapError(streamer, err)
 	}
-	if ownerManagemntState != common.OwnerManagementStateOcpAccount {
+	if ownerMetadata.State != common.OwnerManagementStateOcpAccount {
 		return handleStatefulSwapError(streamer, NewSwapDeniedError("not an ocp account"))
 	}
+	if ownerMetadata.Type != common.OwnerTypeUser12Words {
+		return handleStatefulSwapError(streamer, NewSwapDeniedError("not a user ocp account"))
+	}
 
 	allow, err := s.antispamGuard.AllowSwap(ctx, swap.FundingSource(initiateCurrencyCreatorSwapReq.FundingSource), owner, fromMint, toMint)
 	if err != nil {