chore(marketplace): use hardhat ignition

codex/contracts/market.nim

@@ -23,6 +23,7 @@
     rewardRecipient: ?Address
     configuration: ?MarketplaceConfig
     requestCache: LruCache[string, StorageRequest]
+    allowanceLock: AsyncLock
 
   MarketSubscription = market.Subscription
   EventSubscription = ethers.Subscription
@@ -76,14 +77,30 @@
 
   return resolvedConfig
 
+template withAllowanceLock*(market: OnChainMarket, body: untyped) =
+  if market.allowanceLock.isNil:
+    market.allowanceLock = newAsyncLock()
+  await market.allowanceLock.acquire()
+  try:
+    body
+  finally:
+    try:
+      market.allowanceLock.release()
+    except AsyncLockError as error:
+      raise newException(Defect, error.msg, error)
+
 proc approveFunds(
     market: OnChainMarket, amount: UInt256
 ) {.async: (raises: [CancelledError, MarketError]).} =
   debug "Approving tokens", amount
   convertEthersError("Failed to approve funds"):
     let tokenAddress = await market.contract.token()
     let token = Erc20Token.new(tokenAddress, market.signer)
-    discard await token.increaseAllowance(market.contract.address(), amount).confirm(1)
+    let owner = await market.signer.getAddress()
+    let spender = market.contract.address
+    market.withAllowanceLock:
+      let allowance = await token.allowance(owner, spender)
+      discard await token.approve(spender, allowance + amount).confirm(1)
 
 method loadConfig*(
     market: OnChainMarket

tests/contracts/testMarket.nim

@@ -498,6 +498,8 @@ ethersuite "On-Chain Market":
 
     let (_, fromTime) = await ethProvider.blockNumberAndTimestamp(BlockTag.latest)
 
+    await ethProvider.advanceTime(1.u256)
+
     await market.reserveSlot(request.id, 1.uint64)
     await market.reserveSlot(request.id, 2.uint64)
     await market.fillSlot(request.id, 1.uint64, proof, request.ask.collateralPerSlot)

tests/integration/hardhatprocess.nim

@@ -63,7 +63,28 @@ method start*(node: HardhatProcess) {.async.} =
     node.process = await startProcess(
       node.executable,
       node.workingDir,
-      @["node", "--export", "deployment-localhost.json"].concat(node.arguments),
+      @["node"].concat(node.arguments),
+      options = poptions,
+      stdoutHandle = AsyncProcess.Pipe,
+    )
+
+    discard await startProcess(
+      node.executable,
+      node.workingDir,
+      @["node", "run", "scripts/mine.js", "--network", "localhost"].concat(
+        node.arguments
+      ),
+      options = poptions,
+      stdoutHandle = AsyncProcess.Pipe,
+    )
+
+    discard await startProcess(
+      node.executable,
+      node.workingDir,
+      @[
+        "node", "ignition", "deploy", "ignition/modules/marketplace.js", "--network",
+        "localhost",
+      ].concat(node.arguments),
       options = poptions,
       stdoutHandle = AsyncProcess.Pipe,
     )