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: Add issue/redeem history API #378

Merged
merged 3 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions app/model/db/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,20 @@
IDXE2EMessaging,
IDXE2EMessagingBlockNumber
)
from .idx_issue_redeem import (
IDXIssueRedeem,
IDXIssueRedeemEventType,
IDXIssueRedeemSortItem,
IDXIssueRedeemBlockNumber
)
from .idx_transfer import (
IDXTransfer,
IDXTransfersSortItem,
IDXTransferBlockNumber
)
from .idx_transfer_approval import (
IDXTransferApproval,
IDXTransferApprovalsSortItem,
IDXTransferApprovalBlockNumber
)
from .idx_position import (
Expand Down
73 changes: 73 additions & 0 deletions app/model/db/idx_issue_redeem.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"""
Copyright BOOSTRY Co., Ltd.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and
limitations under the License.

SPDX-License-Identifier: Apache-2.0
"""
from enum import Enum

from sqlalchemy import (
Column,
BigInteger,
String,
DateTime
)

from .base import Base


class IDXIssueRedeem(Base):
"""INDEX Issue/Redeem"""
__tablename__ = "idx_issue_redeem"

id = Column(BigInteger, primary_key=True, autoincrement=True)
# event type
event_type = Column(String(10), index=True)
# transaction hash
transaction_hash = Column(String(66), index=True)
# token address
token_address = Column(String(42), index=True)
# locked address
locked_address = Column(String(42), index=True)
# target (account) address
target_address = Column(String(42), index=True)
# amount
amount = Column(BigInteger)
# block timestamp
block_timestamp = Column(DateTime)


class IDXIssueRedeemEventType(str, Enum):
"""Issue/Redeem event type"""
ISSUE = "Issue"
REDEEM = "Redeem"


class IDXIssueRedeemSortItem(str, Enum):
"""Issue/Redeem sort item"""
BLOCK_TIMESTAMP = "block_timestamp"
LOCKED_ADDRESS = "locked_address"
TARGET_ADDRESS = "target_address"
AMOUNT = "amount"


class IDXIssueRedeemBlockNumber(Base):
"""Synchronized blockNumber of IDXIssueRedeem"""
__tablename__ = "idx_issue_redeem_block_number"

# sequence id
id = Column(BigInteger, primary_key=True, autoincrement=True)
# latest blockNumber
latest_block_number = Column(BigInteger)
9 changes: 9 additions & 0 deletions app/model/db/idx_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

SPDX-License-Identifier: Apache-2.0
"""
from enum import Enum

from sqlalchemy import (
Column,
BigInteger,
Expand Down Expand Up @@ -45,6 +47,13 @@ class IDXTransfer(Base):
block_timestamp = Column(DateTime)


class IDXTransfersSortItem(str, Enum):
BLOCK_TIMESTAMP = "block_timestamp"
FROM_ADDRESS = "from_address"
TO_ADDRESS = "to_address"
AMOUNT = "amount"


class IDXTransferBlockNumber(Base):
"""Synchronized blockNumber of IDXTransfer"""
__tablename__ = "idx_transfer_block_number"
Expand Down
14 changes: 14 additions & 0 deletions app/model/db/idx_transfer_approval.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

SPDX-License-Identifier: Apache-2.0
"""
from enum import Enum

from sqlalchemy import (
Boolean,
Column,
Expand Down Expand Up @@ -78,6 +80,18 @@ def json(self):
}


class IDXTransferApprovalsSortItem(str, Enum):
ID = "id"
EXCHANGE_ADDRESS = "exchange_address"
APPLICATION_ID = "application_id"
FROM_ADDRESS = "from_address"
TO_ADDRESS = "to_address"
AMOUNT = "amount"
APPLICATION_DATETIME = "application_datetime"
APPROVAL_DATETIME = "approval_datetime"
STATUS = "status"


class IDXTransferApprovalBlockNumber(Base):
"""Synchronized blockNumber of IDXTransferApproval"""
__tablename__ = "idx_transfer_approval_block_number"
Expand Down
88 changes: 53 additions & 35 deletions app/model/schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

SPDX-License-Identifier: Apache-2.0
"""
from .index import (
E2EEResponse,
BlockNumberResponse
)
from .account import (
AccountCreateKeyRequest,
AccountGenerateRsaKeyRequest,
Expand All @@ -29,6 +25,17 @@
AccountResponse,
AccountAuthTokenResponse
)
from .batch_issue_redeem import (
BatchIssueRedeemUploadIdResponse,
GetBatchIssueRedeemResponse,
GetBatchIssueRedeemResult,
ListBatchIssueRedeemUploadResponse
)
from .bulk_transfer import (
BulkTransferUploadIdResponse,
BulkTransferUploadResponse,
BulkTransferResponse
)
from .e2e_messaging import (
E2EMessagingAccountCreateRequest,
E2EMessagingAccountUpdateRsaKeyRequest,
Expand All @@ -38,6 +45,24 @@
E2EMessagingResponse,
ListAllE2EMessagingResponse
)
from .file import (
UploadFileRequest,
FileResponse,
ListAllFilesResponse,
DownloadFileResponse
)
from .holder import (
HolderResponse,
HolderCountResponse
)
from .index import (
E2EEResponse,
BlockNumberResponse
)
from .issue_redeem import (
IssueRedeemEvent,
IssueRedeemHistoryResponse
)
from .ledger import (
CreateUpdateLedgerTemplateRequest,
CreateUpdateLedgerDetailsDataRequest,
Expand All @@ -49,6 +74,24 @@
RetrieveLedgerDetailsDataResponse
)
from .notification import ListAllNotificationsResponse
from .personal_info import (
ModifyPersonalInfoRequest,
RegisterPersonalInfoRequest,
BatchRegisterPersonalInfoUploadResponse,
ListBatchRegisterPersonalInfoUploadResponse,
GetBatchRegisterPersonalInfoResponse,
BatchRegisterPersonalInfoResult
)
from .position import (
PositionResponse,
ListAllPositionResponse
)
from .scheduled_events import (
IbetStraightBondScheduledUpdate,
IbetShareScheduledUpdate,
ScheduledEventIdResponse,
ScheduledEventResponse
)
from .token import (
IbetStraightBondCreate,
IbetStraightBondUpdate,
Expand All @@ -67,43 +110,18 @@
IbetStraightBondResponse,
IbetShareResponse
)
from .holder import (
HolderResponse,
HolderCountResponse
from .token_holders import (
CreateTokenHoldersListRequest,
CreateTokenHoldersListResponse,
GetTokenHoldersListResponse
)
from .transfer import (
UpdateTransferApprovalRequest,
UpdateTransferApprovalOperationType,
TransferResponse,
TransferHistoryResponse,
TransferApprovalsResponse,
TransferApprovalTokenResponse,
TransferApprovalHistoryResponse
)
from .batch_issue_redeem import (
BatchIssueRedeemUploadIdResponse
)
from .bulk_transfer import (
BulkTransferUploadIdResponse,
BulkTransferUploadResponse,
BulkTransferResponse
)
from .scheduled_events import (
IbetStraightBondScheduledUpdate,
IbetShareScheduledUpdate,
ScheduledEventIdResponse,
ScheduledEventResponse
)
from .personal_info import (
ModifyPersonalInfoRequest,
RegisterPersonalInfoRequest
)
from .position import (
PositionResponse,
ListAllPositionResponse
)
from .file import (
UploadFileRequest,
FileResponse,
ListAllFilesResponse,
DownloadFileResponse
)
from .types import ResultSet
47 changes: 47 additions & 0 deletions app/model/schema/issue_redeem.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
"""
Copyright BOOSTRY Co., Ltd.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and
limitations under the License.

SPDX-License-Identifier: Apache-2.0
"""
from typing import List
from pydantic import BaseModel

from .types import ResultSet


############################
# REQUEST
############################


############################
# RESPONSE
############################

class IssueRedeemEvent(BaseModel):
"""Issue/Redeem event"""
transaction_hash: str
token_address: str
locked_address: str
target_address: str
amount: int
block_timestamp: str


class IssueRedeemHistoryResponse(BaseModel):
"""Issue/Redeem history"""
result_set: ResultSet
history: List[IssueRedeemEvent]
2 changes: 1 addition & 1 deletion app/model/schema/scheduled_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from datetime import datetime
from app.model.db import TokenType
from app.model.schema import (
from .token import (
IbetStraightBondUpdate,
IbetShareUpdate
)
Expand Down
12 changes: 8 additions & 4 deletions app/model/schema/transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

SPDX-License-Identifier: Apache-2.0
"""
from enum import Enum
from typing import (
List,
Optional
Expand All @@ -25,15 +26,18 @@
Field
)

from .types import (
ResultSet,
UpdateTransferApprovalOperationType
)
from .types import ResultSet


############################
# REQUEST
############################

class UpdateTransferApprovalOperationType(str, Enum):
APPROVE = "approve"
CANCEL = "cancel"


class UpdateTransferApprovalRequest(BaseModel):
"""Update Transfer Approval schema (Request)"""
operation_type: UpdateTransferApprovalOperationType = Field(...)
Expand Down
24 changes: 0 additions & 24 deletions app/model/schema/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,3 @@ class ResultSet(BaseModel):
offset: Optional[int]
limit: Optional[int]
total: Optional[int]


class TransfersSortItem(str, Enum):
BLOCK_TIMESTAMP = "block_timestamp"
FROM_ADDRESS = "from_address"
TO_ADDRESS = "to_address"
AMOUNT = "amount"


class TransferApprovalsSortItem(str, Enum):
ID = "id"
EXCHANGE_ADDRESS = "exchange_address"
APPLICATION_ID = "application_id"
FROM_ADDRESS = "from_address"
TO_ADDRESS = "to_address"
AMOUNT = "amount"
APPLICATION_DATETIME = "application_datetime"
APPROVAL_DATETIME = "approval_datetime"
STATUS = "status"


class UpdateTransferApprovalOperationType(str, Enum):
APPROVE = "approve"
CANCEL = "cancel"
Loading