2022-05-19 19:56:03 +00:00
|
|
|
## Nim-Codex
|
2022-03-02 16:30:42 +00:00
|
|
|
## Copyright (c) 2021 Status Research & Development GmbH
|
|
|
|
## Licensed under either of
|
|
|
|
## * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
|
|
|
|
## * MIT license ([LICENSE-MIT](LICENSE-MIT))
|
|
|
|
## at your option.
|
|
|
|
## This file may not be copied, modified, or distributed except according to
|
|
|
|
## those terms.
|
|
|
|
|
2022-03-18 22:17:51 +00:00
|
|
|
import pkg/upraises
|
|
|
|
|
|
|
|
push: {.upraises: [].}
|
|
|
|
|
2022-03-02 16:30:42 +00:00
|
|
|
import std/options
|
|
|
|
|
|
|
|
import pkg/chronos
|
|
|
|
import pkg/libp2p
|
|
|
|
import pkg/lrucache
|
|
|
|
import pkg/questionable
|
|
|
|
import pkg/questionable/results
|
|
|
|
|
|
|
|
import ./blockstore
|
2023-07-06 23:23:27 +00:00
|
|
|
import ../units
|
2022-03-02 16:30:42 +00:00
|
|
|
import ../chunker
|
|
|
|
import ../errors
|
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
|
|
|
import ../logutils
|
2022-12-03 00:00:55 +00:00
|
|
|
import ../manifest
|
2023-11-14 12:02:17 +00:00
|
|
|
import ../merkletree
|
|
|
|
import ../utils
|
2023-11-06 08:10:30 +00:00
|
|
|
import ../clock
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
export blockstore
|
|
|
|
|
|
|
|
logScope:
|
2022-05-19 19:56:03 +00:00
|
|
|
topics = "codex cachestore"
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
type
|
|
|
|
CacheStore* = ref object of BlockStore
|
2023-07-06 23:23:27 +00:00
|
|
|
currentSize*: NBytes
|
|
|
|
size*: NBytes
|
2022-03-02 16:30:42 +00:00
|
|
|
cache: LruCache[Cid, Block]
|
2023-12-21 06:41:43 +00:00
|
|
|
cidAndProofCache: LruCache[(Cid, Natural), (Cid, CodexProof)]
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2022-05-19 19:56:03 +00:00
|
|
|
InvalidBlockSize* = object of CodexError
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
const
|
2023-07-06 23:23:27 +00:00
|
|
|
DefaultCacheSize*: NBytes = 5.MiBs
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2022-08-19 00:56:36 +00:00
|
|
|
method getBlock*(self: CacheStore, cid: Cid): Future[?!Block] {.async.} =
|
2022-03-02 16:30:42 +00:00
|
|
|
## Get a block from the stores
|
|
|
|
##
|
|
|
|
|
2022-04-05 14:24:48 +00:00
|
|
|
trace "Getting block from cache", cid
|
2022-08-19 00:56:36 +00:00
|
|
|
|
2022-04-05 14:24:48 +00:00
|
|
|
if cid.isEmpty:
|
|
|
|
trace "Empty block, ignoring"
|
2023-11-14 12:02:17 +00:00
|
|
|
return cid.emptyBlock
|
2022-04-05 14:24:48 +00:00
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
if cid notin self.cache:
|
2023-11-14 12:02:17 +00:00
|
|
|
return failure (ref BlockNotFoundError)(msg: "Block not in cache " & $cid)
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
try:
|
2022-08-19 00:56:36 +00:00
|
|
|
return success self.cache[cid]
|
2024-05-23 15:29:30 +00:00
|
|
|
except CancelledError as error:
|
|
|
|
raise error
|
2022-07-28 00:39:17 +00:00
|
|
|
except CatchableError as exc:
|
2022-08-19 00:56:36 +00:00
|
|
|
trace "Error requesting block from cache", cid, error = exc.msg
|
|
|
|
return failure exc
|
2022-07-28 00:39:17 +00:00
|
|
|
|
2024-01-08 22:52:46 +00:00
|
|
|
method getCidAndProof*(
|
|
|
|
self: CacheStore,
|
|
|
|
treeCid: Cid,
|
|
|
|
index: Natural): Future[?!(Cid, CodexProof)] {.async.} =
|
|
|
|
|
2023-11-14 12:02:17 +00:00
|
|
|
if cidAndProof =? self.cidAndProofCache.getOption((treeCid, index)):
|
|
|
|
success(cidAndProof)
|
|
|
|
else:
|
|
|
|
failure(newException(BlockNotFoundError, "Block not in cache: " & $BlockAddress.init(treeCid, index)))
|
|
|
|
|
|
|
|
method getBlock*(self: CacheStore, treeCid: Cid, index: Natural): Future[?!Block] {.async.} =
|
2024-01-08 22:52:46 +00:00
|
|
|
without cidAndProof =? (await self.getCidAndProof(treeCid, index)), err:
|
2023-11-14 12:02:17 +00:00
|
|
|
return failure(err)
|
|
|
|
|
|
|
|
await self.getBlock(cidAndProof[0])
|
|
|
|
|
2023-12-21 06:41:43 +00:00
|
|
|
method getBlockAndProof*(self: CacheStore, treeCid: Cid, index: Natural): Future[?!(Block, CodexProof)] {.async.} =
|
2024-01-08 22:52:46 +00:00
|
|
|
without cidAndProof =? (await self.getCidAndProof(treeCid, index)), err:
|
2023-11-14 12:02:17 +00:00
|
|
|
return failure(err)
|
|
|
|
|
|
|
|
let (cid, proof) = cidAndProof
|
|
|
|
|
|
|
|
without blk =? await self.getBlock(cid), err:
|
|
|
|
return failure(err)
|
|
|
|
|
|
|
|
success((blk, proof))
|
|
|
|
|
|
|
|
method getBlock*(self: CacheStore, address: BlockAddress): Future[?!Block] =
|
|
|
|
if address.leaf:
|
|
|
|
self.getBlock(address.treeCid, address.index)
|
|
|
|
else:
|
|
|
|
self.getBlock(address.cid)
|
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
method hasBlock*(self: CacheStore, cid: Cid): Future[?!bool] {.async.} =
|
|
|
|
## Check if the block exists in the blockstore
|
2022-03-02 16:30:42 +00:00
|
|
|
##
|
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
trace "Checking CacheStore for block presence", cid
|
2022-04-05 14:24:48 +00:00
|
|
|
if cid.isEmpty:
|
|
|
|
trace "Empty block, ignoring"
|
2022-07-28 00:39:17 +00:00
|
|
|
return true.success
|
|
|
|
|
|
|
|
return (cid in self.cache).success
|
2022-04-05 14:24:48 +00:00
|
|
|
|
2023-11-14 12:02:17 +00:00
|
|
|
method hasBlock*(self: CacheStore, treeCid: Cid, index: Natural): Future[?!bool] {.async.} =
|
2024-01-08 22:52:46 +00:00
|
|
|
without cidAndProof =? (await self.getCidAndProof(treeCid, index)), err:
|
2023-11-14 12:02:17 +00:00
|
|
|
if err of BlockNotFoundError:
|
|
|
|
return success(false)
|
|
|
|
else:
|
|
|
|
return failure(err)
|
|
|
|
|
|
|
|
await self.hasBlock(cidAndProof[0])
|
|
|
|
|
2022-12-03 00:00:55 +00:00
|
|
|
func cids(self: CacheStore): (iterator: Cid {.gcsafe.}) =
|
|
|
|
return iterator(): Cid =
|
|
|
|
for cid in self.cache.keys:
|
|
|
|
yield cid
|
|
|
|
|
|
|
|
method listBlocks*(
|
2023-06-22 15:11:18 +00:00
|
|
|
self: CacheStore,
|
|
|
|
blockType = BlockType.Manifest
|
2023-11-14 12:02:17 +00:00
|
|
|
): Future[?!AsyncIter[?Cid]] {.async.} =
|
2022-07-28 00:39:17 +00:00
|
|
|
## Get the list of blocks in the BlockStore. This is an intensive operation
|
|
|
|
##
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2022-12-03 00:00:55 +00:00
|
|
|
let
|
|
|
|
cids = self.cids()
|
|
|
|
|
2024-06-10 22:47:29 +00:00
|
|
|
proc isFinished(): bool =
|
|
|
|
return finished(cids)
|
|
|
|
|
|
|
|
proc genNext(): Future[Cid] {.async.} =
|
|
|
|
cids()
|
|
|
|
|
|
|
|
let iter = await (AsyncIter[Cid].new(genNext, isFinished)
|
|
|
|
.filter(
|
|
|
|
proc (cid: Cid): Future[bool] {.async.} =
|
|
|
|
without isManifest =? cid.isManifest, err:
|
|
|
|
trace "Error checking if cid is a manifest", err = err.msg
|
|
|
|
return false
|
|
|
|
|
|
|
|
case blockType:
|
|
|
|
of BlockType.Both:
|
|
|
|
return true
|
|
|
|
of BlockType.Manifest:
|
|
|
|
return isManifest
|
|
|
|
of BlockType.Block:
|
|
|
|
return not isManifest
|
|
|
|
))
|
|
|
|
|
|
|
|
return success(map[Cid, ?Cid](iter,
|
|
|
|
proc (cid: Cid): Future[?Cid] {.async.} =
|
|
|
|
some(cid)
|
|
|
|
))
|
2022-07-28 00:39:17 +00:00
|
|
|
|
2022-03-02 16:30:42 +00:00
|
|
|
func putBlockSync(self: CacheStore, blk: Block): bool =
|
|
|
|
|
2023-07-06 23:23:27 +00:00
|
|
|
let blkSize = blk.data.len.NBytes # in bytes
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
if blkSize > self.size:
|
2022-04-05 14:24:48 +00:00
|
|
|
trace "Block size is larger than cache size", blk = blkSize, cache = self.size
|
2022-03-02 16:30:42 +00:00
|
|
|
return false
|
|
|
|
|
|
|
|
while self.currentSize + blkSize > self.size:
|
|
|
|
try:
|
|
|
|
let removed = self.cache.removeLru()
|
2023-07-06 23:23:27 +00:00
|
|
|
self.currentSize -= removed.data.len.NBytes
|
2022-04-05 14:24:48 +00:00
|
|
|
except EmptyLruCacheError as exc:
|
2022-03-02 16:30:42 +00:00
|
|
|
# if the cache is empty, can't remove anything, so break and add item
|
|
|
|
# to the cache
|
2022-04-05 14:24:48 +00:00
|
|
|
trace "Exception puting block to cache", exc = exc.msg
|
2022-03-02 16:30:42 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
self.cache[blk.cid] = blk
|
|
|
|
self.currentSize += blkSize
|
|
|
|
return true
|
|
|
|
|
2022-12-03 00:00:55 +00:00
|
|
|
method putBlock*(
|
|
|
|
self: CacheStore,
|
|
|
|
blk: Block,
|
|
|
|
ttl = Duration.none): Future[?!void] {.async.} =
|
2022-03-02 16:30:42 +00:00
|
|
|
## Put a block to the blockstore
|
|
|
|
##
|
2022-04-05 14:24:48 +00:00
|
|
|
|
|
|
|
trace "Storing block in cache", cid = blk.cid
|
|
|
|
if blk.isEmpty:
|
|
|
|
trace "Empty block, ignoring"
|
2022-07-28 00:39:17 +00:00
|
|
|
return success()
|
2022-04-05 14:24:48 +00:00
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
discard self.putBlockSync(blk)
|
Release v0.1.4 (#912)
* 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>
2024-09-24 10:19:58 +00:00
|
|
|
if onBlock =? self.onBlockStored:
|
|
|
|
await onBlock(blk.cid)
|
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
return success()
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2024-01-08 22:52:46 +00:00
|
|
|
method putCidAndProof*(
|
2023-11-14 12:02:17 +00:00
|
|
|
self: CacheStore,
|
|
|
|
treeCid: Cid,
|
|
|
|
index: Natural,
|
|
|
|
blockCid: Cid,
|
2023-12-21 06:41:43 +00:00
|
|
|
proof: CodexProof
|
2023-11-14 12:02:17 +00:00
|
|
|
): Future[?!void] {.async.} =
|
|
|
|
self.cidAndProofCache[(treeCid, index)] = (blockCid, proof)
|
|
|
|
success()
|
|
|
|
|
2023-11-06 08:10:30 +00:00
|
|
|
method ensureExpiry*(
|
|
|
|
self: CacheStore,
|
|
|
|
cid: Cid,
|
|
|
|
expiry: SecondsSince1970
|
|
|
|
): Future[?!void] {.async.} =
|
|
|
|
## Updates block's assosicated TTL in store - not applicable for CacheStore
|
|
|
|
##
|
|
|
|
|
|
|
|
discard # CacheStore does not have notion of TTL
|
|
|
|
|
2023-11-22 10:09:12 +00:00
|
|
|
method ensureExpiry*(
|
|
|
|
self: CacheStore,
|
|
|
|
treeCid: Cid,
|
|
|
|
index: Natural,
|
|
|
|
expiry: SecondsSince1970
|
|
|
|
): Future[?!void] {.async.} =
|
|
|
|
## Updates block's associated TTL in store - not applicable for CacheStore
|
|
|
|
##
|
|
|
|
|
|
|
|
discard # CacheStore does not have notion of TTL
|
|
|
|
|
2022-07-28 00:39:17 +00:00
|
|
|
method delBlock*(self: CacheStore, cid: Cid): Future[?!void] {.async.} =
|
2022-06-28 16:10:05 +00:00
|
|
|
## Delete a block from the blockstore
|
2022-03-02 16:30:42 +00:00
|
|
|
##
|
|
|
|
|
2022-04-05 14:24:48 +00:00
|
|
|
trace "Deleting block from cache", cid
|
|
|
|
if cid.isEmpty:
|
|
|
|
trace "Empty block, ignoring"
|
2022-06-28 16:10:05 +00:00
|
|
|
return success()
|
2022-04-05 14:24:48 +00:00
|
|
|
|
2022-06-28 16:10:05 +00:00
|
|
|
let removed = self.cache.del(cid)
|
|
|
|
if removed.isSome:
|
2023-07-06 23:23:27 +00:00
|
|
|
self.currentSize -= removed.get.data.len.NBytes
|
2022-06-28 16:10:05 +00:00
|
|
|
|
|
|
|
return success()
|
2022-03-02 16:30:42 +00:00
|
|
|
|
2023-11-14 12:02:17 +00:00
|
|
|
method delBlock*(self: CacheStore, treeCid: Cid, index: Natural): Future[?!void] {.async.} =
|
|
|
|
let maybeRemoved = self.cidAndProofCache.del((treeCid, index))
|
|
|
|
|
|
|
|
if removed =? maybeRemoved:
|
|
|
|
return await self.delBlock(removed[0])
|
2023-11-14 17:52:27 +00:00
|
|
|
|
2023-11-14 12:02:17 +00:00
|
|
|
return success()
|
|
|
|
|
2022-07-22 23:38:49 +00:00
|
|
|
method close*(self: CacheStore): Future[void] {.async.} =
|
|
|
|
## Close the blockstore, a no-op for this implementation
|
|
|
|
##
|
|
|
|
|
|
|
|
discard
|
|
|
|
|
2023-07-06 23:23:27 +00:00
|
|
|
proc new*(
|
2022-03-02 16:30:42 +00:00
|
|
|
_: type CacheStore,
|
|
|
|
blocks: openArray[Block] = [],
|
2023-07-06 23:23:27 +00:00
|
|
|
cacheSize: NBytes = DefaultCacheSize,
|
|
|
|
chunkSize: NBytes = DefaultChunkSize
|
2023-06-22 15:11:18 +00:00
|
|
|
): CacheStore {.raises: [Defect, ValueError].} =
|
|
|
|
## Create a new CacheStore instance
|
2023-09-25 14:31:10 +00:00
|
|
|
##
|
2023-06-22 15:11:18 +00:00
|
|
|
## `cacheSize` and `chunkSize` are both in bytes
|
2023-09-25 14:31:10 +00:00
|
|
|
##
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
if cacheSize < chunkSize:
|
|
|
|
raise newException(ValueError, "cacheSize cannot be less than chunkSize")
|
|
|
|
|
|
|
|
let
|
2023-07-06 23:23:27 +00:00
|
|
|
currentSize = 0'nb
|
|
|
|
size = int(cacheSize div chunkSize)
|
2022-03-02 16:30:42 +00:00
|
|
|
cache = newLruCache[Cid, Block](size)
|
2023-12-21 06:41:43 +00:00
|
|
|
cidAndProofCache = newLruCache[(Cid, Natural), (Cid, CodexProof)](size)
|
2022-03-02 16:30:42 +00:00
|
|
|
store = CacheStore(
|
|
|
|
cache: cache,
|
2023-11-14 12:02:17 +00:00
|
|
|
cidAndProofCache: cidAndProofCache,
|
2022-03-02 16:30:42 +00:00
|
|
|
currentSize: currentSize,
|
Release v0.1.4 (#912)
* 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>
2024-09-24 10:19:58 +00:00
|
|
|
size: cacheSize,
|
|
|
|
onBlockStored: CidCallback.none)
|
2022-03-02 16:30:42 +00:00
|
|
|
|
|
|
|
for blk in blocks:
|
|
|
|
discard store.putBlockSync(blk)
|
|
|
|
|
|
|
|
return store
|
2023-07-06 23:23:27 +00:00
|
|
|
|
|
|
|
proc new*(
|
|
|
|
_: type CacheStore,
|
|
|
|
blocks: openArray[Block] = [],
|
|
|
|
cacheSize: int,
|
|
|
|
chunkSize: int
|
|
|
|
): CacheStore {.raises: [Defect, ValueError].} =
|
|
|
|
CacheStore.new(blocks, NBytes cacheSize, NBytes chunkSize)
|