2023-09-01 05:44:41 +00:00
|
|
|
import pkg/questionable
|
|
|
|
import pkg/stew/byteutils
|
2023-11-09 08:47:09 +00:00
|
|
|
import pkg/libp2p
|
|
|
|
import pkg/codexdht/discv5/node as dn
|
|
|
|
import pkg/codexdht/discv5/routing_table as rt
|
2022-05-09 13:15:23 +00:00
|
|
|
import ../sales
|
2022-05-11 08:51:59 +00:00
|
|
|
import ../purchasing
|
2023-09-01 05:44:41 +00:00
|
|
|
import ../utils/json
|
2023-11-09 08:47:09 +00:00
|
|
|
import ../manifest
|
2023-06-21 05:46:18 +00:00
|
|
|
|
|
|
|
export json
|
2022-05-09 13:15:23 +00:00
|
|
|
|
2022-05-10 12:13:39 +00:00
|
|
|
type
|
|
|
|
StorageRequestParams* = object
|
2023-09-01 05:44:41 +00:00
|
|
|
duration* {.serialize.}: UInt256
|
|
|
|
proofProbability* {.serialize.}: UInt256
|
|
|
|
reward* {.serialize.}: UInt256
|
|
|
|
collateral* {.serialize.}: UInt256
|
|
|
|
expiry* {.serialize.}: ?UInt256
|
|
|
|
nodes* {.serialize.}: ?uint
|
|
|
|
tolerance* {.serialize.}: ?uint
|
|
|
|
|
|
|
|
RestPurchase* = object
|
|
|
|
requestId* {.serialize.}: RequestId
|
|
|
|
request* {.serialize.}: ?StorageRequest
|
|
|
|
state* {.serialize.}: string
|
|
|
|
error* {.serialize.}: ?string
|
|
|
|
|
|
|
|
RestAvailability* = object
|
|
|
|
size* {.serialize.}: UInt256
|
|
|
|
duration* {.serialize.}: UInt256
|
|
|
|
minPrice* {.serialize.}: UInt256
|
|
|
|
maxCollateral* {.serialize.}: UInt256
|
2022-08-18 05:55:53 +00:00
|
|
|
|
2023-12-07 01:16:36 +00:00
|
|
|
RestSalesAgent* = object
|
|
|
|
state* {.serialize.}: string
|
|
|
|
requestId* {.serialize.}: RequestId
|
|
|
|
slotIndex* {.serialize.}: UInt256
|
|
|
|
|
2023-11-09 08:47:09 +00:00
|
|
|
RestContent* = object
|
|
|
|
cid* {.serialize.}: Cid
|
|
|
|
manifest* {.serialize.}: Manifest
|
|
|
|
|
|
|
|
RestNode* = object
|
2023-11-15 13:29:17 +00:00
|
|
|
nodeId* {.serialize.}: RestNodeId
|
2023-11-09 08:47:09 +00:00
|
|
|
peerId* {.serialize.}: PeerId
|
|
|
|
record* {.serialize.}: SignedPeerRecord
|
|
|
|
address* {.serialize.}: Option[dn.Address]
|
|
|
|
seen* {.serialize.}: bool
|
|
|
|
|
|
|
|
RestRoutingTable* = object
|
|
|
|
localNode* {.serialize.}: RestNode
|
|
|
|
nodes* {.serialize.}: seq[RestNode]
|
|
|
|
|
|
|
|
RestPeerRecord* = object
|
|
|
|
peerId* {.serialize.}: PeerId
|
|
|
|
seqNo* {.serialize.}: uint64
|
|
|
|
addresses* {.serialize.}: seq[AddressInfo]
|
|
|
|
|
2023-11-15 13:29:17 +00:00
|
|
|
RestNodeId* = object
|
|
|
|
id*: NodeId
|
|
|
|
|
2023-12-14 10:57:16 +00:00
|
|
|
RestRepoStore* = object
|
|
|
|
totalBlocks* {.serialize.}: uint
|
|
|
|
quotaMaxBytes* {.serialize.}: uint
|
|
|
|
quotaUsedBytes* {.serialize.}: uint
|
|
|
|
quotaReservedBytes* {.serialize.}: uint
|
|
|
|
|
2023-11-09 08:47:09 +00:00
|
|
|
proc init*(_: type RestContent, cid: Cid, manifest: Manifest): RestContent =
|
|
|
|
RestContent(
|
|
|
|
cid: cid,
|
|
|
|
manifest: manifest
|
|
|
|
)
|
|
|
|
|
|
|
|
proc init*(_: type RestNode, node: dn.Node): RestNode =
|
|
|
|
RestNode(
|
2023-11-15 13:29:17 +00:00
|
|
|
nodeId: RestNodeId.init(node.id),
|
2023-11-09 08:47:09 +00:00
|
|
|
peerId: node.record.data.peerId,
|
|
|
|
record: node.record,
|
|
|
|
address: node.address,
|
|
|
|
seen: node.seen
|
|
|
|
)
|
|
|
|
|
|
|
|
proc init*(_: type RestRoutingTable, routingTable: rt.RoutingTable): RestRoutingTable =
|
|
|
|
var nodes: seq[RestNode] = @[]
|
|
|
|
for bucket in routingTable.buckets:
|
|
|
|
for node in bucket.nodes:
|
|
|
|
nodes.add(RestNode.init(node))
|
|
|
|
|
|
|
|
RestRoutingTable(
|
|
|
|
localNode: RestNode.init(routingTable.localNode),
|
|
|
|
nodes: nodes
|
|
|
|
)
|
|
|
|
|
|
|
|
proc init*(_: type RestPeerRecord, peerRecord: PeerRecord): RestPeerRecord =
|
|
|
|
RestPeerRecord(
|
|
|
|
peerId: peerRecord.peerId,
|
|
|
|
seqNo: peerRecord.seqNo,
|
|
|
|
addresses: peerRecord.addresses
|
|
|
|
)
|
|
|
|
|
2023-11-15 13:29:17 +00:00
|
|
|
proc init*(_: type RestNodeId, id: NodeId): RestNodeId =
|
|
|
|
RestNodeId(
|
|
|
|
id: id
|
|
|
|
)
|
|
|
|
|
2023-06-20 12:52:15 +00:00
|
|
|
func `%`*(obj: StorageRequest | Slot): JsonNode =
|
|
|
|
let jsonObj = newJObject()
|
|
|
|
for k, v in obj.fieldPairs: jsonObj[k] = %v
|
|
|
|
jsonObj["id"] = %(obj.id)
|
|
|
|
|
|
|
|
return jsonObj
|
2023-11-09 08:47:09 +00:00
|
|
|
|
feat: create logging proxy (#663)
* implement a logging proxy
The logging proxy:
- prevents the need to import chronicles (as well as export except toJson),
- prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization,
- and handles json formatting correctly in chronicles json sinks
* Rename logging -> logutils to avoid ambiguity with common names
* clean up
* add setProperty for JsonRecord, remove nim-json-serialization conflict
* Allow specifying textlines and json format separately
Not specifying a LogFormat will apply the formatting to both textlines and json sinks.
Specifying a LogFormat will apply the formatting to only that sink.
* remove unneeded usages of std/json
We only need to import utils/json instead of std/json
* move serialization from rest/json to utils/json so it can be shared
* fix NoColors ambiguity
Was causing unit tests to fail on Windows.
* Remove nre usage to fix Windows error
Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :)
* Add logutils module doc
* Shorten logutils.formatIt for `NBytes`
Both json and textlines formatIt were not needed, and could be combined into one formatIt
* remove debug integration test config
debug output and logformat of json for integration test logs
* Use ## module doc to support docgen
* bump nim-poseidon2 to export fromBytes
Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening.
* fixes to get compiling after rebasing master
* Add support for Result types being logged using formatIt
2024-01-23 07:35:03 +00:00
|
|
|
func `%`*(obj: RestNodeId): JsonNode = % $obj.id
|