status-im
/
nim-dagger
mirror of https://github.com/status-im/nim-dagger.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
nim-dagger/codex/contracts/requests.nim

132 lines
3.6 KiB
Nim
Raw Normal View History

[contracts] Update to new marketplace design
2022-03-17 13:15:04 +00:00
import pkg/contractabi
feat: integrate dagger contracts Integrate dagger contracts from `nim-dagger-contracts` repo. Add `dagger-contracts`, `nim-web3`, and all of `nim-web3`’s transitive deps as submodule deps to `nim-dagger`. Note: `nim-web3` and its transitive deps may no longer be needed when we switch to `nim-ethers`. Add a `testContracts` nimble task to test all of the contracts functionality. Namely, this spins up an ethereum simulator, deploys the contracts (in `dagger-contracts`), runs the contract tests, and finally, regardless of success/error, kills the ethereum sim processes. The nimble task can be run with `./env.sh nimble testContracts`. We also tested `nim-dagger-contracts` as a submodule dep of `nim-dagger`, and while the tests run as expected, the preference is to merge `nim-dagger-contracts` inside of `nim-dagger` for ease of parallel development. There’s also a high probability that `nim-dagger-contracts` is not being used as a dep by other projects. Are there any strong objections to this? Co-authored-by: Michael Bradley <michaelsbradleyjr@gmail.com>
2022-01-25 00:22:58 +00:00
import pkg/nimcrypto
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
import pkg/ethers/fields
import pkg/questionable/results
feat: integrate dagger contracts Integrate dagger contracts from `nim-dagger-contracts` repo. Add `dagger-contracts`, `nim-web3`, and all of `nim-web3`’s transitive deps as submodule deps to `nim-dagger`. Note: `nim-web3` and its transitive deps may no longer be needed when we switch to `nim-ethers`. Add a `testContracts` nimble task to test all of the contracts functionality. Namely, this spins up an ethereum simulator, deploys the contracts (in `dagger-contracts`), runs the contract tests, and finally, regardless of success/error, kills the ethereum sim processes. The nimble task can be run with `./env.sh nimble testContracts`. We also tested `nim-dagger-contracts` as a submodule dep of `nim-dagger`, and while the tests run as expected, the preference is to merge `nim-dagger-contracts` inside of `nim-dagger` for ease of parallel development. There’s also a high probability that `nim-dagger-contracts` is not being used as a dep by other projects. Are there any strong objections to this? Co-authored-by: Michael Bradley <michaelsbradleyjr@gmail.com>
2022-01-25 00:22:58 +00:00
[contracts] Split marketplace.nim into requests.nim and offers.nim
2022-03-23 08:11:15 +00:00
export contractabi
feat: integrate dagger contracts Integrate dagger contracts from `nim-dagger-contracts` repo. Add `dagger-contracts`, `nim-web3`, and all of `nim-web3`’s transitive deps as submodule deps to `nim-dagger`. Note: `nim-web3` and its transitive deps may no longer be needed when we switch to `nim-ethers`. Add a `testContracts` nimble task to test all of the contracts functionality. Namely, this spins up an ethereum simulator, deploys the contracts (in `dagger-contracts`), runs the contract tests, and finally, regardless of success/error, kills the ethereum sim processes. The nimble task can be run with `./env.sh nimble testContracts`. We also tested `nim-dagger-contracts` as a submodule dep of `nim-dagger`, and while the tests run as expected, the preference is to merge `nim-dagger-contracts` inside of `nim-dagger` for ease of parallel development. There’s also a high probability that `nim-dagger-contracts` is not being used as a dep by other projects. Are there any strong objections to this? Co-authored-by: Michael Bradley <michaelsbradleyjr@gmail.com>
2022-01-25 00:22:58 +00:00
type
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
StorageRequest* = object
client*: Address
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
ask*: StorageAsk
content*: StorageContent
expiry*: UInt256
nonce*: array[32, byte]
StorageAsk* = object
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
size*: UInt256
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
duration*: UInt256
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
proofProbability*: UInt256
[contracts] Rename: maxPrice -> reward
2022-07-20 12:11:00 +00:00
reward*: UInt256
[contracts] replace totalNodes and nodeId by slots
2022-07-20 12:18:12 +00:00
slots*: uint64
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
StorageContent* = object
cid*: string
erasure*: StorageErasure
por*: StoragePoR
StorageErasure* = object
totalChunks*: uint64
StoragePoR* = object
u*: seq[byte]
publicKey*: seq[byte]
name*: seq[byte]
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
func fromTuple(_: type StorageRequest, tupl: tuple): StorageRequest =
StorageRequest(
client: tupl[0],
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
ask: tupl[1],
content: tupl[2],
expiry: tupl[3],
nonce: tupl[4]
)
func fromTuple(_: type StorageAsk, tupl: tuple): StorageAsk =
StorageAsk(
size: tupl[0],
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
duration: tupl[1],
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
proofProbability: tupl[2],
[contracts] replace totalNodes and nodeId by slots
2022-07-20 12:18:12 +00:00
reward: tupl[3],
slots: tupl[4]
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
)
func fromTuple(_: type StorageContent, tupl: tuple): StorageContent =
StorageContent(
cid: tupl[0],
erasure: tupl[1],
por: tupl[2]
)
func fromTuple(_: type StorageErasure, tupl: tuple): StorageErasure =
StorageErasure(
[contracts] replace totalNodes and nodeId by slots
2022-07-20 12:18:12 +00:00
totalChunks: tupl[0]
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
)
func fromTuple(_: type StoragePoR, tupl: tuple): StoragePoR =
StoragePoR(
u: tupl[0],
publicKey: tupl[1],
name: tupl[2]
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
)
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
func solidityType*(_: type StoragePoR): string =
solidityType(StoragePoR.fieldTypes)
func solidityType*(_: type StorageErasure): string =
solidityType(StorageErasure.fieldTypes)
func solidityType*(_: type StorageContent): string =
solidityType(StorageContent.fieldTypes)
func solidityType*(_: type StorageAsk): string =
solidityType(StorageAsk.fieldTypes)
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
func solidityType*(_: type StorageRequest): string =
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
solidityType(StorageRequest.fieldTypes)
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
func encode*(encoder: var AbiEncoder, por: StoragePoR) =
encoder.write(por.fieldValues)
func encode*(encoder: var AbiEncoder, erasure: StorageErasure) =
encoder.write(erasure.fieldValues)
func encode*(encoder: var AbiEncoder, content: StorageContent) =
encoder.write(content.fieldValues)
func encode*(encoder: var AbiEncoder, ask: StorageAsk) =
encoder.write(ask.fieldValues)
[contracts] StorageRequest/Offer is object instead of tuple
2022-03-23 13:20:36 +00:00
func encode*(encoder: var AbiEncoder, request: StorageRequest) =
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
encoder.write(request.fieldValues)
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
func decode*(decoder: var AbiDecoder, T: type StoragePoR): ?!T =
let tupl = ?decoder.read(StoragePoR.fieldTypes)
success StoragePoR.fromTuple(tupl)
func decode*(decoder: var AbiDecoder, T: type StorageErasure): ?!T =
let tupl = ?decoder.read(StorageErasure.fieldTypes)
success StorageErasure.fromTuple(tupl)
func decode*(decoder: var AbiDecoder, T: type StorageContent): ?!T =
let tupl = ?decoder.read(StorageContent.fieldTypes)
success StorageContent.fromTuple(tupl)
func decode*(decoder: var AbiDecoder, T: type StorageAsk): ?!T =
let tupl = ?decoder.read(StorageAsk.fieldTypes)
success StorageAsk.fromTuple(tupl)
[contracts] Wrap contracts in Market abstraction
2022-03-28 15:24:28 +00:00
func decode*(decoder: var AbiDecoder, T: type StorageRequest): ?!T =
let tupl = ?decoder.read(StorageRequest.fieldTypes)
success StorageRequest.fromTuple(tupl)
feat: integrate dagger contracts Integrate dagger contracts from `nim-dagger-contracts` repo. Add `dagger-contracts`, `nim-web3`, and all of `nim-web3`’s transitive deps as submodule deps to `nim-dagger`. Note: `nim-web3` and its transitive deps may no longer be needed when we switch to `nim-ethers`. Add a `testContracts` nimble task to test all of the contracts functionality. Namely, this spins up an ethereum simulator, deploys the contracts (in `dagger-contracts`), runs the contract tests, and finally, regardless of success/error, kills the ethereum sim processes. The nimble task can be run with `./env.sh nimble testContracts`. We also tested `nim-dagger-contracts` as a submodule dep of `nim-dagger`, and while the tests run as expected, the preference is to merge `nim-dagger-contracts` inside of `nim-dagger` for ease of parallel development. There’s also a high probability that `nim-dagger-contracts` is not being used as a dep by other projects. Are there any strong objections to this? Co-authored-by: Michael Bradley <michaelsbradleyjr@gmail.com>
2022-01-25 00:22:58 +00:00
[contracts] Update to new marketplace design
2022-03-17 13:15:04 +00:00
func id*(request: StorageRequest): array[32, byte] =
Update to latest dagger-contracts (#78) - StorageRequest struct has changed - StorageRequested event has changed, it no longer returns the entire request, but only the id and the ask
2022-04-11 18:03:55 +00:00
let encoding = AbiEncoder.encode((request, ))
feat: integrate dagger contracts Integrate dagger contracts from `nim-dagger-contracts` repo. Add `dagger-contracts`, `nim-web3`, and all of `nim-web3`’s transitive deps as submodule deps to `nim-dagger`. Note: `nim-web3` and its transitive deps may no longer be needed when we switch to `nim-ethers`. Add a `testContracts` nimble task to test all of the contracts functionality. Namely, this spins up an ethereum simulator, deploys the contracts (in `dagger-contracts`), runs the contract tests, and finally, regardless of success/error, kills the ethereum sim processes. The nimble task can be run with `./env.sh nimble testContracts`. We also tested `nim-dagger-contracts` as a submodule dep of `nim-dagger`, and while the tests run as expected, the preference is to merge `nim-dagger-contracts` inside of `nim-dagger` for ease of parallel development. There’s also a high probability that `nim-dagger-contracts` is not being used as a dep by other projects. Are there any strong objections to this? Co-authored-by: Michael Bradley <michaelsbradleyjr@gmail.com>
2022-01-25 00:22:58 +00:00
keccak256.digest(encoding).data
[contracts] Replace fulfillRequest() by fillSlot()
2022-07-20 13:30:13 +00:00
[market] Remove old getHost() overload Is superseded by the new overload that includes a slot id parameter.
2022-07-27 14:54:34 +00:00
func slotId*(requestId: array[32, byte], slot: UInt256): array[32, byte] =
let encoding = AbiEncoder.encode((requestId, slot))
[contracts] Replace fulfillRequest() by fillSlot()
2022-07-20 13:30:13 +00:00
keccak256.digest(encoding).data
[market] Remove old getHost() overload Is superseded by the new overload that includes a slot id parameter.
2022-07-27 14:54:34 +00:00
func slotId*(request: StorageRequest, slot: UInt256): array[32, byte] =
slotId(request.id, slot)
[contracts] Replace fulfillRequest() by fillSlot()
2022-07-20 13:30:13 +00:00
func price*(request: StorageRequest): UInt256 =
request.ask.slots.u256 * request.ask.duration * request.ask.reward