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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
144 changes: 94 additions & 50 deletions _entities.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,60 +115,91 @@ pair | The currency pair AB represents moving from A to B.

```json
{
"createdAt": "2015-06-04T11:43:30.645Z",
"application": null,
"createdAt": "2018-08-01T09:53:47.020Z",
"denomination": {
"amount": "2.00",
"currency": "USD",
"pair": "USDUSD",
"rate": "1.00"
"amount": "5.00",
"currency": "GBP",
"pair": "GBPUSD",
"rate": "1.31"
},
"destination": {
"CardId": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"amount": "5.57",
"base": "5.61",
"commission": "0.04",
"currency": "EUR",
"description": "Angel Rath",
"fee": "0.00",
"isMember": true,
"node": {
"id": "bc9b3911-4bc1-4c6d-ac05-0ae87dcfc9b3",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "0.85620",
"type": "card",
"username": "angelrath"
},
"fees": [],
"id": "c1c46ee8-b196-4e0f-96cd-76278707ea3c",
"message": "Join Uphold!",
"fees": [{
"amount": "0.04",
"currency": "EUR",
"percentage": "0.65",
"target": "destination",
"type": "exchange"
}],
"id": "2c326b15-7106-48be-a326-06f19e69746b",
"message": null,
"network": "uphold",
"normalized": [{
"amount": "2.00",
"commission": "0.00",
"amount": "6.56",
"commission": "0.05",
"currency": "USD",
"rate": "1.00"
"fee": "0.00",
"rate": "1.00000",
"target": "destination"
}],
"params": {
"currency": "USD",
"margin": "0.00",
"pair": "USDUSD",
"progress": "0",
"rate": "1.00",
"ttl": 7000,
"type": "invite"
},
"status": "waiting",
"type": "transfer",
"origin": {
"amount": "2.00",
"base": "2.00",
"CardId": "718c7c81-ae87-46b3-97d5-131b78d76f05",
"CardId": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"amount": "6.56",
"base": "6.56",
"commission": "0.00",
"currency": "USD",
"description": "John Smith",
"description": "Angel Rath",
"fee": "0.00",
"rate": "1.00",
"isMember": true,
"node": {
"id": "48ce2ac5-c038-4426-b2f8-a2bdbcc93053",
"type": "card",
"user": {
"id": "21e65c4d-55e4-41be-97a1-ff38d8f3d945",
"username": "angelrath"
}
},
"rate": "1.16795",
"sources": [{
"id": "f66f0e7f-20a1-4983-8855-52b96cd57d31",
"amount": "2.00"
"amount": "6.56",
"id": "3db4ef24-c529-421f-8e8f-eb9da1b9a582"
}],
"type": "card",
"username": "johnsmith"
"username": "angelrath"
},
"destination": {
"amount": "2.00",
"base": "2.00",
"commission": "0.00",
"params": {
"currency": "USD",
"description": "leia.organa@senate.coruscant.gov",
"fee": "0.00",
"rate": "1.00",
"type": "email",
"username": null
}
"margin": "0.65",
"pair": "EURUSD",
"progress": "1",
"rate": "1.16795",
"ttl": 18000,
"type": "transfer"
},
"priority": "normal",
"reference": null,
"status": "completed",
"type": "transfer"
}
```

Expand All@@ -179,17 +210,21 @@ Transactions record the movement of value into, within and out of the Uphold net

Property | Description
------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application | The application that created the transaction.
id | A unique ID on the Uphold Network associated with the transaction.
type | The nature of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.
message | A message or note provided by the user at the time the transaction was initiated, with the intent of communicating additional information and context about the nature/purpose of the transaction.
denomination | The funds to be transferred, as originally requested. See "Denomination" below.
fees | The fees that were applied to the transaction.
denomination | The funds to be transferred, as originally requested. See [Denomination](#denomination).
fees | The fees that were applied to the transaction. See [Fees](#fees).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

status | The current status of the transaction. Possible values are: `pending`, `waiting`, `cancelled` or `completed`.
params | Other parameters of this transaction. See [Parameters](#parameters).
createdAt | The date and time the transaction was initiated.
network | The network of the transaction (`uphold` for internal transactions).
normalized | The transaction details in USD. See [Normalized](#normalized).
origin | The sender of the funds. See "Origin and Destination" below.
destination | The recipient of the funds. See "Origin and Destination" below.
priority | The priority of the transaction. Possible values are `normal` and `fast`.
reference | A reference assigned to the transaction.
origin | The sender of the funds. See [Origin](#origin).
destination | The recipient of the funds. See [Destination](#destination).

<aside class="notice">
A transaction can involve 3 different currencies: the currency as <strong>denominated</strong> by the user, the currency at the <strong>origin</strong> card and the currency at the <strong>destination</strong> card. For instance, <i>"transfer 1 BTC from my USD card to my EUR card"</i>. In this case, 1 BTC would be the denominated amount, but the equivalent in USD is debited at the origin, then credited in EUR at the destination.
Expand All@@ -212,12 +247,13 @@ rate | The quoted rate for converting between the denominated currency and t
### Fees
The `fees` property contains an array of fees that were applied to the transaction. Each object in the array contains the following properties:

Property | Description
-------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.
Property | Description
---------- | ---------------------------------------------------------------------------------
amount | The amount to be charged.
currency | The currency for said amount.
percentage | The percentage amount to be charged.
target | Can be `origin` or `destination` and determines where the fee was applied.
type | The type of fee. Can be one of: `deposit`, `exchange`, `network` or `withdrawal`.

<aside class="notice">
<strong>Important Notice</strong>: For further information on our fees, please visit our FAQ: <a href="https://support.uphold.com/hc/en-us/articles/202342496-Is-Uphold-a-free-service-">Is Uphold a free service?</a>
Expand All@@ -232,7 +268,9 @@ currency | The currency in which the total commission is expressed.
margin | Uphold's commission expressed in percentage.
pair | The currency pair associated with any exchange that took place, if any.
progress | In case a transaction is coming in from the outside, how many confirmations have been received.
rate | The exchange rate of the transaction.
ttl | The time this quote is good for, in milliseconds.
type | The type of the transaction. Possible values are `deposit`, `transfer` and `withdrawal`.

### Normalized
The `normalized` property contains the normalized amount and commission values in USD:
Expand All@@ -242,7 +280,9 @@ Property | Description
amount | The amount to be transacted.
commission | The total commission taken on this transaction, either at origin or at destination.
currency | The currency in which the amount and commission are expressed. The value is always `USD`.
fee | The normalized fee amount.
rate | The exchange rate for this pair.
target | Can be `origin` or `destination` and determines where the fee was applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other entries start with "The foo". This should probably adopt the same format, for consistency.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was extracted from the ### Fees section, which was already using this description. Maybe we can improve some of these descriptions in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Should I open an issue in this repo to track that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It would be nice to have a list of low-hanging fruit like this to improve in the near future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I've created #160 to track this particular issue, and added a "bite-size" label for similar issues. Let me know if you prefer a different name for the label, and please tag any relevant existing issues with it.


### Origin
The origin has properties regarding how the transaction affects the origin of the funds:
Expand All@@ -256,6 +296,8 @@ commission | The commission charged by Uphold to process the transaction.
currency | The currency of the funds at the origin.
description | The name of the sender.
fee | The Bitcoin network Fee, if origin is in BTC but destination is not, or is a non-Uphold Bitcoin Address.
isMember | A boolean signaling if the origin user has completed the membership process.
node | The details about the transaction origin node.
rate | The rate for conversion between origin and destination, as expressed in the currency at origin (the inverse of `destination.rate`).
sources | The transactions where the value was originated from (id and amount).
type | The type of endpoint. Possible values are 'card' and 'external'.
Expand All@@ -277,6 +319,8 @@ commission | The commission charged by Uphold to process the transaction. Commi
currency | The denomination of the funds at the time they were sent/received.
description | The name of the recipient. In the case where money is sent via email, the description will contain the email address of the recipient.
fee | The Bitcoin network Fee, if destination is a BTC address but origin is not.
isMember | A boolean signaling if the destination user has completed the membership process.
node | The details about the transaction destination node.
rate | The rate for conversion between origin and destination, as expressed in the currency at destination (the inverse of `origin.rate`).
type | The type of endpoint. Possible values are 'email', 'card' and 'external'.

Expand Down
Loading