mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-01-15 09:16:40 +00:00
2b5a40559e
* chore: bump dependencies, including nim-ethers with chronos v4 support Bumps the following dependencies: - nim-ethers to commit 507ac6a4cc71cec9be7693fa393db4a49b52baf9 which contains a pinned nim-eth version. This is to be replaced by a versioned library, so it will be pinned to a particular version. There is a crucial fix in this version of ethers that fixes nonce management which is causing issues in the Codex testnet. - nim-json-rpc to v0.4.4 - nim-json-serialization to v0.2.8 - nim-serde to v1.2.2 - nim-serialization to v0.2.4 Currently, one of the integration tests is failing. * fix integration test - When a state's run was cancelled, it was being caught as an error due to catching all CatchableErrors. This caused a state transition to SaleErrored, however cancellation of run was not actually an error. Handling this correctly fixed the issue. - Stopping of the clock was moved to after `HostInteractions` (sales) which avoided an assertion around getting time when the clock was not started. * bump ethers to include nonce fix and filter not found fix * bump ethers: fixes missing symbol not exported in ethers * Fix cirdl test imports/exports * Debugging in ci * Handle CancelledErrors for state.run in one place only * Rename `config` to `configuration` There was a symbol clash preventing compilation and it was easiest to rename `config` to `configuration` in the contracts. Not even remotely ideal, but it was the only way. * bump ethers to latest Prevents an issue were `JsonNode.items` symbol could not be found * More changes to support `config` > `configuration` * cleanup * testing to see if this fixes failure in ci * bumps contracts - ensures slot is free before allowing reservation - renames config to configuration to avoid symbol clash
124 lines
4.9 KiB
Nim
124 lines
4.9 KiB
Nim
import pkg/chronos
|
|
import pkg/ethers/testing
|
|
import pkg/ethers/erc20
|
|
import codex/contracts
|
|
import ../ethertest
|
|
import ./examples
|
|
import ./time
|
|
import ./deployment
|
|
|
|
ethersuite "Marketplace contracts":
|
|
let proof = Groth16Proof.example
|
|
|
|
var client, host: Signer
|
|
var rewardRecipient, collateralRecipient: Address
|
|
var marketplace: Marketplace
|
|
var token: Erc20Token
|
|
var periodicity: Periodicity
|
|
var request: StorageRequest
|
|
var slotId: SlotId
|
|
var filledAt: UInt256
|
|
|
|
proc expectedPayout(endTimestamp: UInt256): UInt256 =
|
|
return (endTimestamp - filledAt) * request.ask.reward
|
|
|
|
proc switchAccount(account: Signer) =
|
|
marketplace = marketplace.connect(account)
|
|
token = token.connect(account)
|
|
|
|
setup:
|
|
client = ethProvider.getSigner(accounts[0])
|
|
host = ethProvider.getSigner(accounts[1])
|
|
rewardRecipient = accounts[2]
|
|
collateralRecipient = accounts[3]
|
|
|
|
let address = Marketplace.address(dummyVerifier = true)
|
|
marketplace = Marketplace.new(address, ethProvider.getSigner())
|
|
|
|
let tokenAddress = await marketplace.token()
|
|
token = Erc20Token.new(tokenAddress, ethProvider.getSigner())
|
|
|
|
let config = await marketplace.configuration()
|
|
periodicity = Periodicity(seconds: config.proofs.period)
|
|
|
|
request = StorageRequest.example
|
|
request.client = await client.getAddress()
|
|
|
|
switchAccount(client)
|
|
discard await token.approve(marketplace.address, request.price)
|
|
discard await marketplace.requestStorage(request)
|
|
switchAccount(host)
|
|
discard await token.approve(marketplace.address, request.ask.collateral)
|
|
discard await marketplace.reserveSlot(request.id, 0.u256)
|
|
filledAt = await ethProvider.currentTime()
|
|
discard await marketplace.fillSlot(request.id, 0.u256, proof)
|
|
slotId = request.slotId(0.u256)
|
|
|
|
proc waitUntilProofRequired(slotId: SlotId) {.async.} =
|
|
let currentPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
await ethProvider.advanceTimeTo(periodicity.periodEnd(currentPeriod))
|
|
while not (
|
|
(await marketplace.isProofRequired(slotId)) and
|
|
(await marketplace.getPointer(slotId)) < 250
|
|
):
|
|
await ethProvider.advanceTime(periodicity.seconds)
|
|
|
|
proc startContract() {.async.} =
|
|
for slotIndex in 1..<request.ask.slots:
|
|
discard await token.approve(marketplace.address, request.ask.collateral)
|
|
discard await marketplace.reserveSlot(request.id, slotIndex.u256)
|
|
discard await marketplace.fillSlot(request.id, slotIndex.u256, proof)
|
|
|
|
test "accept marketplace proofs":
|
|
switchAccount(host)
|
|
await waitUntilProofRequired(slotId)
|
|
discard await marketplace.submitProof(slotId, proof)
|
|
|
|
test "can mark missing proofs":
|
|
switchAccount(host)
|
|
await waitUntilProofRequired(slotId)
|
|
let missingPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
let endOfPeriod = periodicity.periodEnd(missingPeriod)
|
|
await ethProvider.advanceTimeTo(endOfPeriod + 1)
|
|
switchAccount(client)
|
|
discard await marketplace.markProofAsMissing(slotId, missingPeriod)
|
|
|
|
test "can be paid out at the end":
|
|
switchAccount(host)
|
|
let address = await host.getAddress()
|
|
await startContract()
|
|
let requestEnd = await marketplace.requestEnd(request.id)
|
|
await ethProvider.advanceTimeTo(requestEnd.u256 + 1)
|
|
let startBalance = await token.balanceOf(address)
|
|
discard await marketplace.freeSlot(slotId)
|
|
let endBalance = await token.balanceOf(address)
|
|
check endBalance == (startBalance + expectedPayout(requestEnd.u256) + request.ask.collateral)
|
|
|
|
test "can be paid out at the end, specifying reward and collateral recipient":
|
|
switchAccount(host)
|
|
let hostAddress = await host.getAddress()
|
|
await startContract()
|
|
let requestEnd = await marketplace.requestEnd(request.id)
|
|
await ethProvider.advanceTimeTo(requestEnd.u256 + 1)
|
|
let startBalanceHost = await token.balanceOf(hostAddress)
|
|
let startBalanceReward = await token.balanceOf(rewardRecipient)
|
|
let startBalanceCollateral = await token.balanceOf(collateralRecipient)
|
|
discard await marketplace.freeSlot(slotId, rewardRecipient, collateralRecipient)
|
|
let endBalanceHost = await token.balanceOf(hostAddress)
|
|
let endBalanceReward = await token.balanceOf(rewardRecipient)
|
|
let endBalanceCollateral = await token.balanceOf(collateralRecipient)
|
|
|
|
check endBalanceHost == startBalanceHost
|
|
check endBalanceReward == (startBalanceReward + expectedPayout(requestEnd.u256))
|
|
check endBalanceCollateral == (startBalanceCollateral + request.ask.collateral)
|
|
|
|
test "cannot mark proofs missing for cancelled request":
|
|
let expiry = await marketplace.requestExpiry(request.id)
|
|
await ethProvider.advanceTimeTo((expiry + 1).u256)
|
|
switchAccount(client)
|
|
let missingPeriod = periodicity.periodOf(await ethProvider.currentTime())
|
|
await ethProvider.advanceTime(periodicity.seconds)
|
|
check await marketplace
|
|
.markProofAsMissing(slotId, missingPeriod)
|
|
.reverts("Slot not accepting proofs")
|