Skip to content

Commit 27cc113

Browse files
committed
Support the new failed status
1 parent 4f36a93 commit 27cc113

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

src/bridgeDataProviders/dipDupBridgeDataProvider/dipDupGraphQLQueryBuilder/dipDupGraphQLQueryBuilder.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ type BridgeOperationStatus =
2121
| 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED'
2222
| 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY'
2323
| 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS'
24-
| 'FAILED_OUTBOX_EXPIRED';
24+
| 'FAILED_OUTBOX_EXPIRED'
25+
| 'FAILED_INBOX_MATCHING_TIMEOUT';
2526

2627
export interface GraphQLTransfersFilter {
2728
type?: BridgeOperationType[] | null;

src/bridgeDataProviders/dipDupBridgeDataProvider/dtos.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ export type BridgeOperationFailedStatus =
99
| 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED'
1010
| 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY'
1111
| 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS'
12-
| 'FAILED_OUTBOX_EXPIRED';
12+
| 'FAILED_OUTBOX_EXPIRED'
13+
| 'FAILED_INBOX_MATCHING_TIMEOUT';
1314

1415
export type BridgeOperationStatus = BridgeOperationCommonStatus | BridgeOperationFailedStatus;
1516

src/bridgeDataProviders/dipDupBridgeDataProvider/mappers.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ export const mapBridgeTokenTransferStatusToBridgeOperationDtoStatuses = (status:
287287
'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED',
288288
'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY',
289289
'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS',
290-
'FAILED_OUTBOX_EXPIRED'
290+
'FAILED_OUTBOX_EXPIRED',
291+
'FAILED_INBOX_MATCHING_TIMEOUT'
291292
];
292293
default:
293294
return null;

tests/dipDupGraphQLQueryBuilder/testCases/getTokenTransfersQueryByAccountAddressesTestCases.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ export const getTokenTransfersQueryByAccountAddressesTestCases: TestCases = [
255255
offset: 0,
256256
limit: 100,
257257
filter: {
258-
status: ['FAILED', 'FAILED_INVALID_ROUTING_INFO_REVERTABLE', 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED', 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY', 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS', 'FAILED_OUTBOX_EXPIRED']
258+
status: ['FAILED', 'FAILED_INVALID_ROUTING_INFO_REVERTABLE', 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED', 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY', 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS', 'FAILED_OUTBOX_EXPIRED', 'FAILED_INBOX_MATCHING_TIMEOUT']
259259
},
260-
expectedQuery: 'query TokenTransfers { bridge_operation( where: { status: { _in: ["FAILED","FAILED_INVALID_ROUTING_INFO_REVERTABLE","FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED","FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY","FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS","FAILED_OUTBOX_EXPIRED"] }, _or: [ { deposit: { l1_transaction: { _or: [ { l1_account: { _eq: "tz1M6VFkpALGXYoP5CvobR3z1pYu7KvirpMF" } }{ l2_account: { _eq: "4a1819c83a78c948db50f80fed82721dd0401c9b" } } ] } } } { withdrawal: { l2_transaction: { _or: [ { l1_account: { _eq: "tz1M6VFkpALGXYoP5CvobR3z1pYu7KvirpMF" } }{ l2_account: { _eq: "4a1819c83a78c948db50f80fed82721dd0401c9b" } } ] } } } ] }, order_by: { created_at: desc }, offset: 0, limit: 100 ) { type status is_completed is_successful created_at updated_at deposit { l1_transaction { level operation_hash counter nonce amount ticket { token { type contract_address token_id } } l1_account l2_account timestamp inbox_message { type level index } } l2_transaction { level transaction_hash log_index amount l2_token { id } timestamp } } withdrawal { l1_transaction { level operation_hash counter nonce timestamp } l2_transaction { level transaction_hash log_index amount l2_token { id ticket { token { type contract_address token_id } } } l1_account l2_account timestamp outbox_message { level index commitment { hash } proof cemented_at } } } } }'
260+
expectedQuery: 'query TokenTransfers { bridge_operation( where: { status: { _in: ["FAILED","FAILED_INVALID_ROUTING_INFO_REVERTABLE","FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED","FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY","FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS","FAILED_OUTBOX_EXPIRED","FAILED_INBOX_MATCHING_TIMEOUT"] }, _or: [ { deposit: { l1_transaction: { _or: [ { l1_account: { _eq: "tz1M6VFkpALGXYoP5CvobR3z1pYu7KvirpMF" } }{ l2_account: { _eq: "4a1819c83a78c948db50f80fed82721dd0401c9b" } } ] } } } { withdrawal: { l2_transaction: { _or: [ { l1_account: { _eq: "tz1M6VFkpALGXYoP5CvobR3z1pYu7KvirpMF" } }{ l2_account: { _eq: "4a1819c83a78c948db50f80fed82721dd0401c9b" } } ] } } } ] }, order_by: { created_at: desc }, offset: 0, limit: 100 ) { type status is_completed is_successful created_at updated_at deposit { l1_transaction { level operation_hash counter nonce amount ticket { token { type contract_address token_id } } l1_account l2_account timestamp inbox_message { type level index } } l2_transaction { level transaction_hash log_index amount l2_token { id } timestamp } } withdrawal { l1_transaction { level operation_hash counter nonce timestamp } l2_transaction { level transaction_hash log_index amount l2_token { id ticket { token { type contract_address token_id } } } l1_account l2_account timestamp outbox_message { level index commitment { hash } proof cemented_at } } } } }'
261261
}
262262
],
263263
[

tests/dipDupGraphQLQueryBuilder/testCases/getTokenTransfersQueryTestCases.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ export const getTokenTransfersQueryTestCases: TestCases = [
146146
offset: 0,
147147
limit: 100,
148148
filter: {
149-
status: ['FAILED', 'FAILED_INVALID_ROUTING_INFO_REVERTABLE', 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED', 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY', 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS', 'FAILED_OUTBOX_EXPIRED']
149+
status: ['FAILED', 'FAILED_INVALID_ROUTING_INFO_REVERTABLE', 'FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED', 'FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY', 'FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS', 'FAILED_OUTBOX_EXPIRED', 'FAILED_INBOX_MATCHING_TIMEOUT']
150150
},
151-
expectedQuery: 'query TokenTransfers { bridge_operation( where: { status: { _in: ["FAILED","FAILED_INVALID_ROUTING_INFO_REVERTABLE","FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED","FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY","FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS","FAILED_OUTBOX_EXPIRED"] } }, order_by: { created_at: desc }, offset: 0, limit: 100 ) { type status is_completed is_successful created_at updated_at deposit { l1_transaction { level operation_hash counter nonce amount ticket { token { type contract_address token_id } } l1_account l2_account timestamp inbox_message { type level index } } l2_transaction { level transaction_hash log_index amount l2_token { id } timestamp } } withdrawal { l1_transaction { level operation_hash counter nonce timestamp } l2_transaction { level transaction_hash log_index amount l2_token { id ticket { token { type contract_address token_id } } } l1_account l2_account timestamp outbox_message { level index commitment { hash } proof cemented_at } } } } }'
151+
expectedQuery: 'query TokenTransfers { bridge_operation( where: { status: { _in: ["FAILED","FAILED_INVALID_ROUTING_INFO_REVERTABLE","FAILED_INVALID_ROUTING_PROXY_NOT_WHITELISTED","FAILED_INVALID_ROUTING_PROXY_EMPTY_PROXY","FAILED_INVALID_ROUTING_INVALID_PROXY_ADDRESS","FAILED_OUTBOX_EXPIRED","FAILED_INBOX_MATCHING_TIMEOUT"] } }, order_by: { created_at: desc }, offset: 0, limit: 100 ) { type status is_completed is_successful created_at updated_at deposit { l1_transaction { level operation_hash counter nonce amount ticket { token { type contract_address token_id } } l1_account l2_account timestamp inbox_message { type level index } } l2_transaction { level transaction_hash log_index amount l2_token { id } timestamp } } withdrawal { l1_transaction { level operation_hash counter nonce timestamp } l2_transaction { level transaction_hash log_index amount l2_token { id ticket { token { type contract_address token_id } } } l1_account l2_account timestamp outbox_message { level index commitment { hash } proof cemented_at } } } } }'
152152
}
153153
],
154154
[

0 commit comments

Comments
 (0)