mirror of
https://github.com/planetmint/planetmint.git
synced 2025-10-14 00:59:17 +00:00
build changes
This commit is contained in:
parent
5fd8bde123
commit
af7ee8ea5b
@ -9,8 +9,12 @@ import json
|
|||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
|
|
||||||
|
<<<<<<< Updated upstream
|
||||||
from planetmint.transactions.common.input import Input
|
from planetmint.transactions.common.input import Input
|
||||||
from planetmint.transactions.common.transaction_link import TransactionLink
|
from planetmint.transactions.common.transaction_link import TransactionLink
|
||||||
|
=======
|
||||||
|
from planetmint.common.transaction import Transaction, Input, TransactionLink
|
||||||
|
>>>>>>> Stashed changes
|
||||||
from planetmint import lib
|
from planetmint import lib
|
||||||
from planetmint.transactions.types.assets.create import Create
|
from planetmint.transactions.types.assets.create import Create
|
||||||
from planetmint.transactions.types.assets.transfer import Transfer
|
from planetmint.transactions.types.assets.transfer import Transfer
|
||||||
|
@ -4,7 +4,11 @@ Content-Type: application/json
|
|||||||
{
|
{
|
||||||
"assets": "/assets/",
|
"assets": "/assets/",
|
||||||
"blocks": "/blocks/",
|
"blocks": "/blocks/",
|
||||||
|
<<<<<<< Updated upstream
|
||||||
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
||||||
|
=======
|
||||||
|
"docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
||||||
|
>>>>>>> Stashed changes
|
||||||
"metadata": "/metadata/",
|
"metadata": "/metadata/",
|
||||||
"outputs": "/outputs/",
|
"outputs": "/outputs/",
|
||||||
"streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
|
"streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
|
||||||
|
@ -6,7 +6,11 @@ Content-Type: application/json
|
|||||||
"v1": {
|
"v1": {
|
||||||
"assets": "/api/v1/assets/",
|
"assets": "/api/v1/assets/",
|
||||||
"blocks": "/api/v1/blocks/",
|
"blocks": "/api/v1/blocks/",
|
||||||
|
<<<<<<< Updated upstream
|
||||||
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
||||||
|
=======
|
||||||
|
"docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html",
|
||||||
|
>>>>>>> Stashed changes
|
||||||
"metadata": "/api/v1/metadata/",
|
"metadata": "/api/v1/metadata/",
|
||||||
"outputs": "/api/v1/outputs/",
|
"outputs": "/api/v1/outputs/",
|
||||||
"streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
|
"streams": "ws://localhost:9985/api/v1/streams/valid_transactions",
|
||||||
@ -14,7 +18,11 @@ Content-Type: application/json
|
|||||||
"validators": "/api/v1/validators"
|
"validators": "/api/v1/validators"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
<<<<<<< Updated upstream
|
||||||
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/",
|
"docs": "https://docs.planetmint.com/projects/server/en/v0.9.0/",
|
||||||
|
=======
|
||||||
|
"docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/",
|
||||||
|
>>>>>>> Stashed changes
|
||||||
"software": "Planetmint",
|
"software": "Planetmint",
|
||||||
"version": "0.9.0"
|
"version": "0.9.0"
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user