Skip to content

Commit 862cbf2

Browse files
gcharanggcharang
committed
syncs dev
2 parents fecbcd6 + 0e8f601 commit 862cbf2

17 files changed

+2334
-961
lines changed

‎.github/workflows/get_data_lint_files_deploy.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
key: npm-${{ hashFiles('package-lock.json') }}
4343
restore-keys: npm-
4444

45-
- name: Generate configs
45+
- name: Generate API methods table
46+
if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
4647
shell: bash
4748
run: ${GITHUB_WORKSPACE}/utils/gen_api_methods_table.py
4849

‎data-for-gpts/all-content.txt

+563-232
Large diffs are not rendered by default.

‎data-for-gpts/komodefi-api/all-api-content.txt

+563-232
Large diffs are not rendered by default.

‎data-for-gpts/komodefi-api/legacy-api-content.txt

+100-117
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ export const description =
44

55
# active\_swaps
66

7-
**active\_swaps (include\_status)**
8-
97
The `active_swaps` method returns all the swaps that are currently running on the Komodo DeFi Framework API node.
108

9+
This method has been deprecated in favor of [active\_swaps v2](/komodo-defi-framework/api/v20/active_swaps/). The legacy version does not include v2 (Trading Protocol Upgrade) swap statuses in responses (it only returns uuids for these).
10+
1111
## Arguments
1212

1313
| Structure | Type | Description |
@@ -42,7 +42,8 @@ The `active_swaps` method returns all the swaps that are currently running on th
4242
"7592a07a-2805-4050-8ab8-984480e812f0",
4343
"82cbad96-ea9f-40fb-9225-07496323e35d",
4444
"177f7fa5-c9f3-4673-a2fa-28451a123e61"
45-
]
45+
],
46+
"statuses": null
4647
}
4748
}
4849
```
@@ -61,122 +62,104 @@ The `active_swaps` method returns all the swaps that are currently running on th
6162

6263
```json
6364
{
64-
"uuids": ["5d02843e-d1b4-488d-aad0-114d82020453"],
65-
"statuses": {
66-
"5d02843e-d1b4-488d-aad0-114d82020453": {
67-
"type": "Taker",
68-
"uuid": "5d02843e-d1b4-488d-aad0-114d82020453",
69-
"events": [
70-
{
71-
"timestamp": 1612780908698,
72-
"event": {
73-
"type": "Started",
74-
"data": {
75-
"taker_coin": "MARTY",
76-
"maker_coin": "DOC",
77-
"maker": "7310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5",
78-
"my_persistent_pub": "03ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36fa",
79-
"lock_duration": 7800,
80-
"maker_amount": "1",
81-
"taker_amount": "1",
82-
"maker_payment_confirmations": 1,
83-
"maker_payment_requires_nota": false,
84-
"taker_payment_confirmations": 1,
85-
"taker_payment_requires_nota": false,
86-
"taker_payment_lock": 1612788708,
87-
"uuid": "5d02843e-d1b4-488d-aad0-114d82020453",
88-
"started_at": 1612780908,
89-
"maker_payment_wait": 1612784028,
90-
"maker_coin_start_block": 793472,
91-
"taker_coin_start_block": 797356,
92-
"fee_to_send_taker_fee": {
93-
"coin": "MARTY",
94-
"amount": "0.00001"
95-
},
96-
"taker_payment_trade_fee": {
97-
"coin": "MARTY",
98-
"amount": "0.00001"
99-
},
100-
"maker_payment_spend_trade_fee": {
101-
"coin": "DOC",
102-
"amount": "0"
103-
}
104-
}
105-
}
106-
},
107-
{
108-
"timestamp": 1612780924704,
109-
"event": {
110-
"type": "Negotiated",
111-
"data": {
112-
"maker_payment_locktime": 1612796508,
113-
"maker_pubkey": "037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5",
114-
"secret_hash": "026bebc2e19c243d0940dd583c9573bf10377afd"
115-
}
116-
}
117-
},
118-
{
119-
"timestamp": 1612780924962,
120-
"event": {
121-
"type": "TakerFeeSent",
122-
"data": {
123-
"tx_hex": "0400008085202f8901f425fbefe21f33ccb7b487df251191b27dfa7b639b04f60e5493c7ea41dbf149000000006b483045022100d5ec3e542175479bd4bd011e19b76a75e99f19cc49867e5bca9541950322c33a02207a4d1ffd674fb9760de79bb4929af44d66344b5e182de3c377186deebf6bf376012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5ce6f305000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588ac7c152160000000000000000000000000000000",
124-
"tx_hash": "75323ab7acd64bd35242611fabaec560d9acf2e1f9ca28d3a4aba47a79fb49c4"
125-
}
126-
}
127-
},
128-
{
129-
"timestamp": 1612780935966,
130-
"event": {
131-
"type": "MakerPaymentReceived",
132-
"data": {
133-
"tx_hex": "0400008085202f89028bef955e42107c562e4e02421f25c455723a701573f86c17b4d82e35a7d8f9f7020000006b483045022100b12fc9d95acca76bf5fd8d5c6acc288b454032ba4561b1c2b1f5f33b2cf2926d022017e561bc2cd93308848674b47b2e8ebd8f074ea78e32454d5fea6f08c0b1f1e40121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff5dfd0b24c0f7c3cf235868cf9a26ec49574764d135796fc4e7d20e95d55a8653000000006a47304402207c752d14601d1c99892f9d6c88c8ff2f93211640a65b2ee69172a16b908b21e402206f0b66684158445888271a849ab46258ad722496ee64fde055a6f44e36ed2ccc0121037310a8fb9fd8f198a1a21db830252ad681fccda580ed4101f3f6bfb98b34fab5ffffffff0300e1f5050000000017a9141b85c1a277f44f7d77d52b78e2ba70a0becc2ff9870000000000000000166a14026bebc2e19c243d0940dd583c9573bf10377afda7d26301000000001976a91486f747b28c60ad1130bdd3f84f48eeaf1801ca9888ac87152160000000000000000000000000000000",
134-
"tx_hash": "27dafe553246553d54f909fbbded80e6d490fdb95ca7b6807d73eca45f0d7a22"
135-
}
136-
}
137-
},
138-
{
139-
"timestamp": 1612780935967,
140-
"event": {
141-
"type": "MakerPaymentWaitConfirmStarted"
142-
}
65+
"uuids": [
66+
"44798382-8c63-4047-b5d8-70a60fa2546b"
67+
],
68+
"statuses": {
69+
"44798382-8c63-4047-b5d8-70a60fa2546b": {
70+
"type": "Taker",
71+
"uuid": "44798382-8c63-4047-b5d8-70a60fa2546b",
72+
"my_order_uuid": "44798382-8c63-4047-b5d8-70a60fa2546b",
73+
"events": [
74+
{
75+
"timestamp": 1730634185287,
76+
"event": {
77+
"type": "Started",
78+
"data": {
79+
"taker_coin": "MARTY",
80+
"maker_coin": "DOC",
81+
"maker": "15d9c51c657ab1be4ae9d3ab6e76a619d3bccfe830d5363fa168424c0d044732",
82+
"my_persistent_pub": "034cbf74541c1d3436bc7638a2738f64df4fee22d4443cdf11d54cea7d7f55f256",
83+
"lock_duration": 7800,
84+
"maker_amount": "2.4",
85+
"taker_amount": "2.4",
86+
"maker_payment_confirmations": 1,
87+
"maker_payment_requires_nota": false,
88+
"taker_payment_confirmations": 1,
89+
"taker_payment_requires_nota": false,
90+
"taker_payment_lock": 1730641984,
91+
"uuid": "44798382-8c63-4047-b5d8-70a60fa2546b",
92+
"started_at": 1730634184,
93+
"maker_payment_wait": 1730637304,
94+
"maker_coin_start_block": 803893,
95+
"taker_coin_start_block": 818506,
96+
"fee_to_send_taker_fee": {
97+
"coin": "MARTY",
98+
"amount": "0.00001",
99+
"paid_from_trading_vol": false
100+
},
101+
"taker_payment_trade_fee": {
102+
"coin": "MARTY",
103+
"amount": "0.00001",
104+
"paid_from_trading_vol": false
105+
},
106+
"maker_payment_spend_trade_fee": {
107+
"coin": "DOC",
108+
"amount": "0.00001",
109+
"paid_from_trading_vol": true
110+
},
111+
"maker_coin_htlc_pubkey": "034cbf74541c1d3436bc7638a2738f64df4fee22d4443cdf11d54cea7d7f55f256",
112+
"taker_coin_htlc_pubkey": "034cbf74541c1d3436bc7638a2738f64df4fee22d4443cdf11d54cea7d7f55f256",
113+
"p2p_privkey": null
114+
}
115+
}
116+
}
117+
],
118+
"maker_amount": "2.4",
119+
"maker_coin": "DOC",
120+
"maker_coin_usd_price": null,
121+
"taker_amount": "2.4",
122+
"taker_coin": "MARTY",
123+
"taker_coin_usd_price": null,
124+
"gui": "mm2_777",
125+
"mm_version": "2.2.0-beta_caf803b",
126+
"success_events": [
127+
"Started",
128+
"Negotiated",
129+
"TakerFeeSent",
130+
"TakerPaymentInstructionsReceived",
131+
"MakerPaymentReceived",
132+
"MakerPaymentWaitConfirmStarted",
133+
"MakerPaymentValidatedAndConfirmed",
134+
"TakerPaymentSent",
135+
"WatcherMessageSent",
136+
"TakerPaymentSpent",
137+
"MakerPaymentSpent",
138+
"MakerPaymentSpentByWatcher",
139+
"MakerPaymentSpendConfirmed",
140+
"Finished"
141+
],
142+
"error_events": [
143+
"StartFailed",
144+
"NegotiateFailed",
145+
"TakerFeeSendFailed",
146+
"MakerPaymentValidateFailed",
147+
"MakerPaymentWaitConfirmFailed",
148+
"TakerPaymentTransactionFailed",
149+
"TakerPaymentWaitConfirmFailed",
150+
"TakerPaymentDataSendFailed",
151+
"TakerPaymentWaitForSpendFailed",
152+
"MakerPaymentSpendFailed",
153+
"MakerPaymentSpendConfirmFailed",
154+
"TakerPaymentWaitRefundStarted",
155+
"TakerPaymentRefundStarted",
156+
"TakerPaymentRefunded",
157+
"TakerPaymentRefundedByWatcher",
158+
"TakerPaymentRefundFailed",
159+
"TakerPaymentRefundFinished"
160+
]
143161
}
144-
],
145-
"maker_amount": "1",
146-
"maker_coin": "DOC",
147-
"taker_amount": "1",
148-
"taker_coin": "MARTY",
149-
"gui": null,
150-
"mm_version": "23c89ced5",
151-
"success_events": [
152-
"Started",
153-
"Negotiated",
154-
"TakerFeeSent",
155-
"MakerPaymentReceived",
156-
"MakerPaymentWaitConfirmStarted",
157-
"MakerPaymentValidatedAndConfirmed",
158-
"TakerPaymentSent",
159-
"TakerPaymentSpent",
160-
"MakerPaymentSpent",
161-
"Finished"
162-
],
163-
"error_events": [
164-
"StartFailed",
165-
"NegotiateFailed",
166-
"TakerFeeSendFailed",
167-
"MakerPaymentValidateFailed",
168-
"MakerPaymentWaitConfirmFailed",
169-
"TakerPaymentTransactionFailed",
170-
"TakerPaymentWaitConfirmFailed",
171-
"TakerPaymentDataSendFailed",
172-
"TakerPaymentWaitForSpendFailed",
173-
"MakerPaymentSpendFailed",
174-
"TakerPaymentWaitRefundStarted",
175-
"TakerPaymentRefunded",
176-
"TakerPaymentRefundFailed"
177-
]
178162
}
179-
}
180163
}
181164
```
182165
export const title = "Komodo DeFi Framework Method: All Swaps UUIDs by Filter";

0 commit comments

Comments
 (0)