mirror of
https://github.com/status-im/nim-codex.git
synced 2025-02-02 14:03:34 +00:00
484124db09
* fix: createReservation lock (#825) * fix: createReservation lock * fix: additional locking places * fix: acquire lock * chore: feedback Co-authored-by: markspanbroek <mark@spanbroek.net> Signed-off-by: Adam Uhlíř <adam@uhlir.dev> * feat: withLock template and fixed tests * fix: use proc for MockReservations constructor * chore: feedback Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> Signed-off-by: Adam Uhlíř <adam@uhlir.dev> * chore: feedback implementation --------- Signed-off-by: Adam Uhlíř <adam@uhlir.dev> Co-authored-by: markspanbroek <mark@spanbroek.net> Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> * Block deletion with ref count & repostore refactor (#631) * Fix StoreStream so it doesn't return parity bytes (#838) * fix storestream so it doesn\'t return parity bits for protected/verifiable manifests * use Cid.example instead of creating a mock manually * Fix verifiable manifest initialization (#839) * fix verifiable manifest initialization * fix linearstrategy, use verifiableStrategy to select blocks for slots * check for both strategies in attribute inheritance test * ci: add verify_circuit=true to the releases (#840) * provisional fix so EC errors do not crash the node on download (#841) * prevent node crashing with `not val.isNil` (#843) * bump nim-leopard to handle no parity data (#845) * Fix verifiable manifest constructor (#844) * Fix verifiable manifest constructor * Add integration test for verifiable manifest download Add integration test for testing download of verifiable dataset after creating request for storage * add missing import * add testecbug to integration suite * Remove hardhat instance from integration test * change description, drop echo --------- Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> Co-authored-by: gmega <giuliano.mega@gmail.com> * Bump Nim to 1.6.21 (#851) * bump Nim to 1.6.21 (range type reset fixes) * remove incompatible versions from compiler matrix * feat(rest): adds erasure coding constraints when requesting storage (#848) * Rest API: add erasure coding constraints when requesting storage * clean up * Make error message for "dataset too small" more informative. * fix API integration test --------- Co-authored-by: gmega <giuliano.mega@gmail.com> * Prover workshop band-aid (#853) * add prover bandaid * Improve error message text Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> Signed-off-by: Giuliano Mega <giuliano.mega@gmail.com> --------- Signed-off-by: Giuliano Mega <giuliano.mega@gmail.com> Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> * Bandaid for failing erasure coding (#855) * Update Release workflow (#858) Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Fixes prover behavior with singleton proof trees (#859) * add logs and test * add Merkle proof checks * factor out Circom input normalization, fix proof input serialization * add test and update existing ones * update circuit assets * add back trace message * switch contracts to fix branch * update codex-contracts-eth to latest * do not expose prove with prenormalized inputs * Chronos v4 Update (v3 Compat Mode) (#814) * add changes to use chronos v4 in compat mode * switch chronos to compat fix branch * use nimbus-build-system with configurable Nim repo * add missing imports * add missing await * bump compat * pin nim version in Makefile * add await instead of asyncSpawn to advertisement queue loop * bump DHT to v0.5.0 * allow error state of `onBatch` to propagate upwards in test code * pin Nim compiler commit to avoid fetching stale branch * make CI build against branch head instead of merge * fix handling of return values in testslotqueue * Downgrade to gcc 13 on Windows (#874) * Downgrade to gcc 13 on Windows Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Increase build job timeout to 90 minutes Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> --------- Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Add MIT/Apache licenses (#861) * Add MIT/Apache licenses * Center "Apache License" Signed-off-by: Giuliano Mega <giuliano.mega@gmail.com> * remove wrong legal entity; rename apache license file --------- Signed-off-by: Giuliano Mega <giuliano.mega@gmail.com> * Add OPTIONS endpoint to allow the content-type header for the upload endpoint (#869) * Add OPTIONS endpoint to allow the content-type header exec git commit --amend --no-edit -S * Remove useless header "Access-Control-Headers" and add cache Signed-off-by: Arnaud <arnaud@status.im> --------- Signed-off-by: Arnaud <arnaud@status.im> Co-authored-by: Giuliano Mega <giuliano.mega@gmail.com> * chore: add `downtimeProduct` config parameter (#867) * chore: add `downtimeProduct` config parameter * bump codex-contracts-eth to master * Support CORS preflight requests when the storage request api returns an error (#878) * Add CORS headers when the REST API is returning an error * Use the allowedOrigin instead of the wilcard when setting the origin Signed-off-by: Arnaud <arnaud@status.im> --------- Signed-off-by: Arnaud <arnaud@status.im> * refactor(marketplace): generic querying of historical marketplace events (#872) * refactor(marketplace): move marketplace events to the Market abstraction Move marketplace contract events to the Market abstraction so the types can be shared across all modules that call the Market abstraction. * Remove unneeded conversion * Switch to generic implementation of event querying * change parent type to MarketplaceEvent * Remove extra license file (#876) * remove extra license * center "apache license" * Update advertising (#862) * Setting up advertiser * Wires up advertiser * cleanup * test compiles * tests pass * setting up test for advertiser * Finishes advertiser tests * fixes commonstore tests * Review comments by Giuliano * Race condition found by Giuliano * Review comment by Dmitriy Co-authored-by: Dmitriy Ryajov <dryajov@gmail.com> Signed-off-by: Ben Bierens <39762930+benbierens@users.noreply.github.com> * fixes tests --------- Signed-off-by: Ben Bierens <39762930+benbierens@users.noreply.github.com> Co-authored-by: Dmitriy Ryajov <dryajov@gmail.com> * feat: add `--payout-address` (#870) * feat: add `--payout-address` Allows SPs to be paid out to a separate address, keeping their profits secure. Supports https://github.com/codex-storage/codex-contracts-eth/pull/144 in the nim-codex client. * Remove optional payoutAddress Change --payout-address so that it is no longer optional. There is no longer an overload in `Marketplace.sol` for `fillSlot` accepting no `payoutAddress`. * Update integration tests to include --payout-address * move payoutAddress from fillSlot to freeSlot * Update integration tests to use required payoutAddress - to make payoutAddress required, the integration tests needed to avoid building the cli params until just before starting the node, otherwise if cli params were added ad-hoc, there would be an error after a non-required parameter was added before a required parameter. * support client payout address - withdrawFunds requires a withdrawAddress parameter, directs payouts for withdrawing of client funds (for a cancelled request) to go to that address. * fix integration test adds --payout-address to validators * refactor: support withdrawFunds and freeSlot optional parameters - withdrawFunds has an optional parameter for withdrawRecipient - freeSlot has optional parameters for rewardRecipient and collateralRecipient - change --payout-address to --reward-recipient to match contract signature naming * Revert "Update integration tests to include --payout-address" This reverts commit 8f9535cf35b0f2b183ac4013a7ed11b246486964. There are some valid improvements to the integration tests, but they can be handled in a separate PR. * small fix * bump contracts to fix marketplace spec * bump codex-contracts-eth, now rebased on master * bump codex-contracts-eth now that feat/reward-address has been merged to master * clean up, comments * Rework circuit downloader (#882) * Introduces a start method to prover * Moves backend creation into start method * sets up three paths for backend initialization * Extracts backend initialization to backend-factory * Implements loading backend from cli files or previously downloaded local files * Wires up downloading and unzipping * functional implementation * Fixes testprover.nim * Sets up tests for backendfactory * includes libzip-dev * pulls in updated contracts * removes integration cli tests for r1cs, wasm, and zkey file arguments. * Fixes issue where inner-scope values are lost before returning * sets local proof verification for dist-test images * Adds two traces and bumps nim-ethers * Adds separate path for circuit files * Create circuit dir if not exists * fix: make sure requestStorage is mined * fix: correct place to plug confirm * test: fixing contracts tests * Restores gitmodules * restores nim-datastore reference * Sets up downloader exe * sets up tool skeleton * implements getting of circuit hash * Implements downloader tool * sets up test skeleton * Implements test for cirdl * includes testTools in testAll * Cleanup building.md * cleans up previous downloader implementation * cleans up testbackendfactory * moves start of prover into node.nim * Fills in arguments in example command * Initializes backend in prover constructor * Restores tests * Restores tests for cli instructions * Review comments by Dmitriy, part 1 * Quotes path in download instruction. * replaces curl with chronos http session * Moves cirdl build output to 'build' folder. * Fixes chronicles log output * Add cirdl support to the codex Dockerfile Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Add cirdl support to the docker entrypoint Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Add cirdl support to the release workflow Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Disable verify_circuit flag for releases Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> * Removes backendFactory placeholder type * wip * Replaces zip library with status-im/zippy library (which supports zip and tar) * Updates cirdl to not change circuitdir folder * Switches from zip to tar.gz * Review comments by Dmitriy * updates codex-contracts-eth * Adds testTools to CI * Adds check for access to config.circuitdir * Update fixture circuit zkey * Update matrix to run tools tests on Windows * Adds 'deps' dependency for cirdl * Adjust docker-entrypoint.sh to use CODEX_CIRCUIT_DIR env var * Review comments by Giuliano --------- Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> Co-authored-by: Adam Uhlíř <adam@uhlir.dev> Co-authored-by: Veaceslav Doina <20563034+veaceslavdoina@users.noreply.github.com> * Support CORS for POST and PATCH availability endpoints (#897) * Adds testnet marketplace address to known deployments (#911) * API tweaks for OpenAPI, errors and endpoints (#886) * All sort of tweaks * docs: availability's minPrice doc * Revert changes to the two node test example * Change default EC params in REST API Change default EC params in REST API to 3 nodes and 1 tolerance. Adjust integration tests to honour these settings. --------- Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> --------- Signed-off-by: Adam Uhlíř <adam@uhlir.dev> Signed-off-by: Giuliano Mega <giuliano.mega@gmail.com> Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> Signed-off-by: Arnaud <arnaud@status.im> Signed-off-by: Ben Bierens <39762930+benbierens@users.noreply.github.com> Co-authored-by: Adam Uhlíř <adam@uhlir.dev> Co-authored-by: markspanbroek <mark@spanbroek.net> Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com> Co-authored-by: Tomasz Bekas <tomasz.bekas@gmail.com> Co-authored-by: Giuliano Mega <giuliano.mega@gmail.com> Co-authored-by: Arnaud <arno.deville@gmail.com> Co-authored-by: Ben Bierens <39762930+benbierens@users.noreply.github.com> Co-authored-by: Dmitriy Ryajov <dryajov@gmail.com> Co-authored-by: Arnaud <arnaud@status.im>
240 lines
7.1 KiB
Nim
240 lines
7.1 KiB
Nim
import std/httpclient
|
|
import std/strutils
|
|
|
|
from pkg/libp2p import Cid, `$`, init
|
|
import pkg/stint
|
|
import pkg/questionable/results
|
|
import pkg/chronos/apps/http/[httpserver, shttpserver, httpclient]
|
|
import pkg/codex/logutils
|
|
import pkg/codex/rest/json
|
|
import pkg/codex/purchasing
|
|
import pkg/codex/errors
|
|
import pkg/codex/sales/reservations
|
|
|
|
export purchasing
|
|
|
|
type CodexClient* = ref object
|
|
http: HttpClient
|
|
baseurl: string
|
|
session: HttpSessionRef
|
|
|
|
type CodexClientError* = object of CatchableError
|
|
|
|
proc new*(_: type CodexClient, baseurl: string): CodexClient =
|
|
CodexClient(
|
|
http: newHttpClient(),
|
|
baseurl: baseurl,
|
|
session: HttpSessionRef.new({HttpClientFlag.Http11Pipeline})
|
|
)
|
|
|
|
proc info*(client: CodexClient): ?!JsonNode =
|
|
let url = client.baseurl & "/debug/info"
|
|
JsonNode.parse( client.http.getContent(url) )
|
|
|
|
proc setLogLevel*(client: CodexClient, level: string) =
|
|
let url = client.baseurl & "/debug/chronicles/loglevel?level=" & level
|
|
let headers = newHttpHeaders({"Content-Type": "text/plain"})
|
|
let response = client.http.request(url, httpMethod=HttpPost, headers=headers)
|
|
assert response.status == "200 OK"
|
|
|
|
proc upload*(client: CodexClient, contents: string): ?!Cid =
|
|
let response = client.http.post(client.baseurl & "/data", contents)
|
|
assert response.status == "200 OK"
|
|
Cid.init(response.body).mapFailure
|
|
|
|
proc download*(client: CodexClient, cid: Cid, local = false): ?!string =
|
|
let
|
|
response = client.http.get(
|
|
client.baseurl & "/data/" & $cid &
|
|
(if local: "" else: "/network"))
|
|
|
|
if response.status != "200 OK":
|
|
return failure(response.status)
|
|
|
|
success response.body
|
|
|
|
proc downloadBytes*(
|
|
client: CodexClient,
|
|
cid: Cid,
|
|
local = false): Future[?!seq[byte]] {.async.} =
|
|
|
|
let uri = parseUri(
|
|
client.baseurl & "/data/" & $cid &
|
|
(if local: "" else: "/network")
|
|
)
|
|
|
|
let (status, bytes) = await client.session.fetch(uri)
|
|
|
|
if status != 200:
|
|
return failure("fetch failed with status " & $status)
|
|
|
|
success bytes
|
|
|
|
proc list*(client: CodexClient): ?!RestContentList =
|
|
let url = client.baseurl & "/data"
|
|
let response = client.http.get(url)
|
|
|
|
if response.status != "200 OK":
|
|
return failure(response.status)
|
|
|
|
RestContentList.fromJson(response.body)
|
|
|
|
proc space*(client: CodexClient): ?!RestRepoStore =
|
|
let url = client.baseurl & "/space"
|
|
let response = client.http.get(url)
|
|
|
|
if response.status != "200 OK":
|
|
return failure(response.status)
|
|
|
|
RestRepoStore.fromJson(response.body)
|
|
|
|
proc requestStorageRaw*(
|
|
client: CodexClient,
|
|
cid: Cid,
|
|
duration: UInt256,
|
|
reward: UInt256,
|
|
proofProbability: UInt256,
|
|
collateral: UInt256,
|
|
expiry: uint = 0,
|
|
nodes: uint = 3,
|
|
tolerance: uint = 1
|
|
): Response =
|
|
|
|
## Call request storage REST endpoint
|
|
##
|
|
let url = client.baseurl & "/storage/request/" & $cid
|
|
let json = %*{
|
|
"duration": duration,
|
|
"reward": reward,
|
|
"proofProbability": proofProbability,
|
|
"collateral": collateral,
|
|
"nodes": nodes,
|
|
"tolerance": tolerance
|
|
}
|
|
|
|
if expiry != 0:
|
|
json["expiry"] = %($expiry)
|
|
|
|
return client.http.post(url, $json)
|
|
|
|
proc requestStorage*(
|
|
client: CodexClient,
|
|
cid: Cid,
|
|
duration: UInt256,
|
|
reward: UInt256,
|
|
proofProbability: UInt256,
|
|
expiry: uint,
|
|
collateral: UInt256,
|
|
nodes: uint = 3,
|
|
tolerance: uint = 1
|
|
): ?!PurchaseId =
|
|
## Call request storage REST endpoint
|
|
##
|
|
let response = client.requestStorageRaw(cid, duration, reward, proofProbability, collateral, expiry, nodes, tolerance)
|
|
if response.status != "200 OK":
|
|
doAssert(false, response.body)
|
|
PurchaseId.fromHex(response.body).catch
|
|
|
|
proc getPurchase*(client: CodexClient, purchaseId: PurchaseId): ?!RestPurchase =
|
|
let url = client.baseurl & "/storage/purchases/" & purchaseId.toHex
|
|
try:
|
|
let body = client.http.getContent(url)
|
|
return RestPurchase.fromJson(body)
|
|
except CatchableError as e:
|
|
return failure e.msg
|
|
|
|
proc getSalesAgent*(client: CodexClient, slotId: SlotId): ?!RestSalesAgent =
|
|
let url = client.baseurl & "/sales/slots/" & slotId.toHex
|
|
try:
|
|
let body = client.http.getContent(url)
|
|
return RestSalesAgent.fromJson(body)
|
|
except CatchableError as e:
|
|
return failure e.msg
|
|
|
|
proc getSlots*(client: CodexClient): ?!seq[Slot] =
|
|
let url = client.baseurl & "/sales/slots"
|
|
let body = client.http.getContent(url)
|
|
seq[Slot].fromJson(body)
|
|
|
|
proc postAvailability*(
|
|
client: CodexClient,
|
|
totalSize, duration, minPrice, maxCollateral: UInt256
|
|
): ?!Availability =
|
|
## Post sales availability endpoint
|
|
##
|
|
let url = client.baseurl & "/sales/availability"
|
|
let json = %*{
|
|
"totalSize": totalSize,
|
|
"duration": duration,
|
|
"minPrice": minPrice,
|
|
"maxCollateral": maxCollateral,
|
|
}
|
|
let response = client.http.post(url, $json)
|
|
doAssert response.status == "201 Created", "expected 201 Created, got " & response.status & ", body: " & response.body
|
|
Availability.fromJson(response.body)
|
|
|
|
proc patchAvailabilityRaw*(
|
|
client: CodexClient,
|
|
availabilityId: AvailabilityId,
|
|
totalSize, freeSize, duration, minPrice, maxCollateral: ?UInt256 = UInt256.none
|
|
): Response =
|
|
## Updates availability
|
|
##
|
|
let url = client.baseurl & "/sales/availability/" & $availabilityId
|
|
|
|
# TODO: Optionalize macro does not keep `serialize` pragmas so we can't use `Optionalize(RestAvailability)` here.
|
|
var json = %*{}
|
|
|
|
if totalSize =? totalSize:
|
|
json["totalSize"] = %totalSize
|
|
|
|
if freeSize =? freeSize:
|
|
json["freeSize"] = %freeSize
|
|
|
|
if duration =? duration:
|
|
json["duration"] = %duration
|
|
|
|
if minPrice =? minPrice:
|
|
json["minPrice"] = %minPrice
|
|
|
|
if maxCollateral =? maxCollateral:
|
|
json["maxCollateral"] = %maxCollateral
|
|
|
|
client.http.patch(url, $json)
|
|
|
|
proc patchAvailability*(
|
|
client: CodexClient,
|
|
availabilityId: AvailabilityId,
|
|
totalSize, duration, minPrice, maxCollateral: ?UInt256 = UInt256.none
|
|
): void =
|
|
let response = client.patchAvailabilityRaw(availabilityId, totalSize=totalSize, duration=duration, minPrice=minPrice, maxCollateral=maxCollateral)
|
|
doAssert response.status == "200 OK", "expected 200 OK, got " & response.status
|
|
|
|
proc getAvailabilities*(client: CodexClient): ?!seq[Availability] =
|
|
## Call sales availability REST endpoint
|
|
let url = client.baseurl & "/sales/availability"
|
|
let body = client.http.getContent(url)
|
|
seq[Availability].fromJson(body)
|
|
|
|
proc getAvailabilityReservations*(client: CodexClient, availabilityId: AvailabilityId): ?!seq[Reservation] =
|
|
## Retrieves Availability's Reservations
|
|
let url = client.baseurl & "/sales/availability/" & $availabilityId & "/reservations"
|
|
let body = client.http.getContent(url)
|
|
seq[Reservation].fromJson(body)
|
|
|
|
proc close*(client: CodexClient) =
|
|
client.http.close()
|
|
|
|
proc restart*(client: CodexClient) =
|
|
client.http.close()
|
|
client.http = newHttpClient()
|
|
|
|
proc purchaseStateIs*(client: CodexClient, id: PurchaseId, state: string): bool =
|
|
client.getPurchase(id).option.?state == some state
|
|
|
|
proc saleStateIs*(client: CodexClient, id: SlotId, state: string): bool =
|
|
client.getSalesAgent(id).option.?state == some state
|
|
|
|
proc requestId*(client: CodexClient, id: PurchaseId): ?RequestId =
|
|
return client.getPurchase(id).option.?requestId
|