Revert "Add implementations for new asset requests"

This reverts commit 13b657d.

Author: georgmittendorfer

foundation/rpc_server/rpc_server.go

@@ -17,7 +17,6 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"io"
-	"math"
 	"net"
 
 	qubic "github.com/qubic/go-node-connector"
@@ -485,199 +484,6 @@ func (s *Server) GetPossessedAssets(ctx context.Context, req *protobuff.Possesse
 	return &protobuff.PossessedAssetsResponse{PossessedAssets: possessedAssets}, nil
 }
 
-func (s *Server) GetIssuedAssetByUniverseIndex(ctx context.Context, request *protobuff.GetIssuedAssetByUniverseIndexRequest) (*protobuff.AssetIssuance, error) {
-	client, err := s.qPool.Get()
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "getting pool connection :%v", err)
-	}
-
-	assets, err := client.GetAssetsByUniverseIndex(ctx, request.Index)
-	if err != nil {
-		s.qPool.Close(client)
-		return nil, status.Errorf(codes.Internal, "getting assets by universe index %v", err)
-	}
-	s.qPool.Put(client)
-
-	if len(assets) > 0 && assets[0].Asset != (types.AssetIssuanceData{}) { // don't return empty issuance data
-
-		var issuerIdentity types.Identity
-		issuerIdentity, err = issuerIdentity.FromPubKey(assets[0].Asset.PublicKey, false)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get identity for issued asset public key")
-		}
-
-		issuedAsset := protobuff.AssetIssuanceData{
-			IssuerIdentity:        issuerIdentity.String(),
-			Type:                  uint32(assets[0].Asset.Type),
-			Name:                  int8ArrayToString(assets[0].Asset.Name[:]),
-			NumberOfDecimalPlaces: int32(assets[0].Asset.NumberOfDecimalPlaces),
-			UnitOfMeasurement:     int8ArrayToInt32Array(assets[0].Asset.UnitOfMeasurement[:]),
-		}
-
-		asset := protobuff.AssetIssuance{
-			Data:          &issuedAsset,
-			Tick:          assets[0].Tick,
-			UniverseIndex: assets[0].UniverseIndex,
-		}
-
-		return &asset, nil
-	} else {
-		log.Printf("asset with universe index [%d] not found", request.Index)
-		return nil, status.Error(codes.NotFound, "asset not found")
-	}
-
-}
-
-func (s *Server) GetIssuedAssetsByFilter(ctx context.Context, request *protobuff.GetIssuedAssetsByFilterRequest) (*protobuff.AssetIssuances, error) {
-
-	client, err := s.qPool.Get()
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "getting pool connection :%v", err)
-	}
-
-	assets, err := client.GetAssetIssuancesByFilter(ctx, request.GetIssuerIdentity(), request.GetAssetName())
-	if err != nil {
-		s.qPool.Close(client)
-		return nil, status.Errorf(codes.Internal, "getting issued assets by filter %v", err)
-	}
-	s.qPool.Put(client)
-
-	assetIssuances := make([]*protobuff.AssetIssuance, 0)
-
-	for _, asset := range assets {
-
-		var issuerIdentity types.Identity
-		issuerIdentity, err = issuerIdentity.FromPubKey(asset.Asset.PublicKey, false)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get identity for issued asset public key")
-		}
-
-		issuedAsset := protobuff.AssetIssuanceData{
-			IssuerIdentity:        issuerIdentity.String(),
-			Type:                  uint32(asset.Asset.Type),
-			Name:                  int8ArrayToString(asset.Asset.Name[:]),
-			NumberOfDecimalPlaces: int32(asset.Asset.NumberOfDecimalPlaces),
-			UnitOfMeasurement:     int8ArrayToInt32Array(asset.Asset.UnitOfMeasurement[:]),
-		}
-
-		assetIssuance := protobuff.AssetIssuance{
-			Data:          &issuedAsset,
-			Tick:          asset.Tick,
-			UniverseIndex: asset.UniverseIndex,
-		}
-
-		assetIssuances = append(assetIssuances, &assetIssuance)
-
-	}
-
-	return &protobuff.AssetIssuances{Assets: assetIssuances}, nil
-}
-
-func (s *Server) GetOwnedAssetsByFilter(ctx context.Context, request *protobuff.GetOwnedAssetsByFilterRequest) (*protobuff.AssetOwnerships, error) {
-
-	if request.GetOwnershipManagingContract() > math.MaxUint16 {
-		return nil, status.Errorf(codes.InvalidArgument, "ownership managing contract value out of range")
-	}
-	contract := uint16(request.GetOwnershipManagingContract())
-
-	client, err := s.qPool.Get()
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "getting pool connection :%v", err)
-	}
-
-	assets, err := client.GetAssetOwnershipsByFilter(ctx, request.GetIssuerIdentity(), request.GetAssetName(), request.GetOwnerIdentity(), contract)
-	if err != nil {
-		s.qPool.Close(client)
-		return nil, status.Errorf(codes.Internal, "getting asset owners by filter %v", err)
-	}
-	s.qPool.Put(client)
-
-	assetOwnerships := make([]*protobuff.AssetOwnership, 0)
-
-	for _, asset := range assets {
-
-		var owner types.Identity
-		owner, err = owner.FromPubKey(asset.Asset.PublicKey, false)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get identity for owner public key")
-		}
-
-		ownedAsset := protobuff.AssetOwnershipData{
-			OwnerIdentity:         owner.String(),
-			Type:                  uint32(asset.Asset.Type),
-			ManagingContractIndex: uint32(asset.Asset.ManagingContractIndex),
-			IssuanceIndex:         asset.Asset.IssuanceIndex,
-			NumberOfUnits:         asset.Asset.NumberOfUnits,
-		}
-
-		assetOwnership := protobuff.AssetOwnership{
-			Data:          &ownedAsset,
-			Tick:          asset.Tick,
-			UniverseIndex: asset.UniverseIndex,
-		}
-
-		assetOwnerships = append(assetOwnerships, &assetOwnership)
-
-	}
-
-	return &protobuff.AssetOwnerships{Assets: assetOwnerships}, nil
-
-}
-
-func (s *Server) GetPossessedAssetsByFilter(ctx context.Context, request *protobuff.GetPossessedAssetsByFilterRequest) (*protobuff.AssetPossessions, error) {
-	if request.GetOwnershipManagingContract() > math.MaxUint16 {
-		return nil, status.Errorf(codes.InvalidArgument, "ownership managing contract value out of range")
-	}
-	ownerContract := uint16(request.GetOwnershipManagingContract())
-
-	if request.GetPossessionManagingContract() > math.MaxUint16 {
-		return nil, status.Errorf(codes.InvalidArgument, "possession managing contract value out of range")
-	}
-	possessorContract := uint16(request.GetPossessionManagingContract())
-
-	client, err := s.qPool.Get()
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "getting pool connection :%v", err)
-	}
-
-	assets, err := client.GetAssetPossessionsByFilter(ctx, request.GetIssuerIdentity(), request.GetAssetName(), request.GetOwnerIdentity(), request.GetPossessorIdentity(), ownerContract, possessorContract)
-	if err != nil {
-		s.qPool.Close(client)
-		return nil, status.Errorf(codes.Internal, "getting asset possessions by filter %v", err)
-	}
-	s.qPool.Put(client)
-
-	assetPossessions := make([]*protobuff.AssetPossession, 0)
-
-	for _, asset := range assets {
-
-		var possessor types.Identity
-		possessor, err = possessor.FromPubKey(asset.Asset.PublicKey, false)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get identity for possessor public key")
-		}
-
-		possessedAsset := protobuff.AssetPossessionData{
-			PossessorIdentity:     possessor.String(),
-			Type:                  uint32(asset.Asset.Type),
-			ManagingContractIndex: uint32(asset.Asset.ManagingContractIndex),
-			OwnershipIndex:        asset.Asset.OwnershipIndex,
-			NumberOfUnits:         asset.Asset.NumberOfUnits,
-		}
-
-		assetPossession := protobuff.AssetPossession{
-			Data:          &possessedAsset,
-			Tick:          asset.Tick,
-			UniverseIndex: asset.UniverseIndex,
-		}
-
-		assetPossessions = append(assetPossessions, &assetPossession)
-
-	}
-
-	return &protobuff.AssetPossessions{Assets: assetPossessions}, nil
-}
-
 func (s *Server) Start() error {
 	srv := grpc.NewServer(
 		grpc.MaxRecvMsgSize(600*1024*1024),

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/ardanlabs/conf v1.5.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0
 	github.com/pkg/errors v0.9.1
-	github.com/qubic/go-node-connector v0.10.3-0.20250227103222-20fcda1a5139
-	github.com/qubic/go-schnorrq v1.0.1
+	github.com/qubic/go-node-connector v0.8.0
+	github.com/qubic/go-schnorrq v1.0.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2

go.sum

@@ -30,12 +30,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/qubic/go-node-connector v0.8.0 h1:GzA8rpLvbEAkqz/AWkM/7Ut4P9KkwrkdP++tmF2eKHs=
 github.com/qubic/go-node-connector v0.8.0/go.mod h1:3Q9xCv5c01AqxVIx1aijMd8Pt3KJyQQiDfc4sG0UnXI=
-github.com/qubic/go-node-connector v0.10.3-0.20250227103222-20fcda1a5139 h1:U4dlesZ6r6ccPht8h+NT8FH8SODZZ4WMfvm6BZJ6lAQ=
-github.com/qubic/go-node-connector v0.10.3-0.20250227103222-20fcda1a5139/go.mod h1:jLbmYx2GUh8Ctk5zULFepgho7yoGZXrU8/tMk+fcuEc=
 github.com/qubic/go-schnorrq v1.0.0 h1:EiCC3v9v3esFFfhKNEGdAI4DFIY3Dm/wbH327pC5qco=
 github.com/qubic/go-schnorrq v1.0.0/go.mod h1:KW64PcvyF4+cBA22pCx9wcoKDqPIbGz0EZ9dCZWV6Yo=
-github.com/qubic/go-schnorrq v1.0.1 h1:F0R/BQVf+O7Bp57NGJmc3uXlqsaIzerg/1bmU4jMLLE=
-github.com/qubic/go-schnorrq v1.0.1/go.mod h1:j2qw/zHiyjH9GAScAAETWpZk6iELbjYnzIg7CQwc5wM=
 github.com/silenceper/pool v1.0.0 h1:JTCaA+U6hJAA0P8nCx+JfsRCHMwLTfatsm5QXelffmU=
 github.com/silenceper/pool v1.0.0/go.mod h1:3DN13bqAbq86Lmzf6iUXWEPIWFPOSYVfaoceFvilKKI=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=