Merge branch 'master' of github.com:MISP/misp-objects

pull/192/head
Alexandre Dulaunoy 2019-07-11 23:00:29 +02:00
commit 919f6638e1
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 12 additions and 10 deletions

View File

@ -1,14 +1,16 @@
{ {
"requiredOneOf": [ "requiredOneOf": [
"wallet-address", "transaction-number",
"value_BTC", "time",
"time" "value_BTC"
], ],
"attributes": { "attributes": {
"transaction-number": { "transaction-number": {
"description": "A Bitcoin transaction number in a sequence of transactions", "description": "A Bitcoin transaction number in a sequence of transactions",
"ui-priority": 0, "ui-priority": 0,
"misp-attribute": "integer" "disable_correlation": true,
"multiple": true,
"misp-attribute": "text"
}, },
"time": { "time": {
"description": "Date and time of transaction", "description": "Date and time of transaction",
@ -41,7 +43,7 @@
"misp-attribute": "btc" "misp-attribute": "btc"
} }
}, },
"version": 1, "version": 4,
"description": "An object to describe a Bitcoin transaction. Best to be used with bitcoin-wallet.", "description": "An object to describe a Bitcoin transaction. Best to be used with bitcoin-wallet.",
"meta-category": "financial", "meta-category": "financial",
"uuid": "B7341729-5A8A-439F-A775-6D814DA3C7B5", "uuid": "B7341729-5A8A-439F-A775-6D814DA3C7B5",

View File

@ -14,14 +14,14 @@
"disable_correlation": true, "disable_correlation": true,
"misp-attribute": "float" "misp-attribute": "float"
}, },
"balance_EUR": { "BTC_received": {
"description": "Value in EUR with conversion rate as of date/time displayed in field 'time'", "description": "Value of received BTC",
"ui-priority": 0, "ui-priority": 0,
"disable_correlation": true, "disable_correlation": true,
"misp-attribute": "float" "misp-attribute": "float"
}, },
"balance_USD": { "BTC_sent": {
"description": "Value in USD with conversion rate as of date/time displayed in field 'time'", "description": "Value of sent BTC",
"ui-priority": 0, "ui-priority": 0,
"disable_correlation": true, "disable_correlation": true,
"misp-attribute": "float" "misp-attribute": "float"
@ -33,7 +33,7 @@
"misp-attribute": "datetime" "misp-attribute": "datetime"
} }
}, },
"version": 1, "version": 2,
"description": "An object to describe a Bitcoin wallet. Best to be used with bitcoin-transactions.", "description": "An object to describe a Bitcoin wallet. Best to be used with bitcoin-transactions.",
"meta-category": "financial", "meta-category": "financial",
"uuid": "22910C83-DD0E-4ED2-9823-45F8CAD562A4", "uuid": "22910C83-DD0E-4ED2-9823-45F8CAD562A4",