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

objects/btc-transaction/definition.json

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

objects/btc-wallet/definition.json

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