From 584e50f5bbb97a6b22463d7cf601bf4c9b6160ca Mon Sep 17 00:00:00 2001 From: Arnaud Date: Sat, 21 Jun 2025 08:50:56 +0200 Subject: [PATCH 1/3] Update gas --- codex/contracts/market.nim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codex/contracts/market.nim b/codex/contracts/market.nim index 3708478f..64f49f7b 100644 --- a/codex/contracts/market.nim +++ b/codex/contracts/market.nim @@ -308,7 +308,7 @@ method freeSlot*( let gas = await market.contract.estimateGas.freeSlot( slotId, rewardRecipient, collateralRecipient ) - let overrides = TransactionOverrides(gasLimit: some (gas * 110) div 100) + let overrides = TransactionOverrides(gasLimit: some (gas * 300) div 100) freeSlot = market.contract.freeSlot( slotId, @@ -323,7 +323,7 @@ method freeSlot*( # Add 10% to gas estimate to deal with different evm code flow when we # happen to be the one to make the request fail let gas = await market.contract.estimateGas.freeSlot(slotId) - let overrides = TransactionOverrides(gasLimit: some (gas * 110) div 100) + let overrides = TransactionOverrides(gasLimit: some (gas * 300) div 100) freeSlot = market.contract.freeSlot(slotId, overrides) @@ -375,7 +375,7 @@ method markProofAsMissing*( # Add 10% to gas estimate to deal with different evm code flow when we # happen to be the one to make the request fail let gas = await market.contract.estimateGas.markProofAsMissing(id, period) - let overrides = TransactionOverrides(gasLimit: some (gas * 110) div 100) + let overrides = TransactionOverrides(gasLimit: some (gas * 150) div 100) discard await market.contract.markProofAsMissing(id, period, overrides).confirm(1) @@ -400,7 +400,7 @@ method reserveSlot*( # Add 10% to gas estimate to deal with different evm code flow when we # happen to be the last one that is allowed to reserve the slot let gas = await market.contract.estimateGas.reserveSlot(requestId, slotIndex) - let overrides = TransactionOverrides(gasLimit: some (gas * 110) div 100) + let overrides = TransactionOverrides(gasLimit: some (gas * 125) div 100) discard await market.contract.reserveSlot(requestId, slotIndex, overrides).confirm(1) From d3b96772d731d03bd0ae363340a0c2497b9e8f42 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Sat, 21 Jun 2025 08:51:10 +0200 Subject: [PATCH 2/3] Catch HttpConnectionError error --- tests/integration/testmarketplace.nim | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/integration/testmarketplace.nim b/tests/integration/testmarketplace.nim index c16893f9..ff345736 100644 --- a/tests/integration/testmarketplace.nim +++ b/tests/integration/testmarketplace.nim @@ -423,12 +423,15 @@ marketplacesuite(name = "Marketplace payouts", stopOnRequestFail = true): let client = provider.client check eventually( block: - let availabilities = (await client.getAvailabilities()).get - let availability = availabilities[0] - let slots = (await client.getSlots()).get - let availableSlots = (3 - slots.len).u256 + try: + let availabilities = (await client.getAvailabilities()).get + let availability = availabilities[0] + let slots = (await client.getSlots()).get + let availableSlots = (3 - slots.len).u256 - availability.totalRemainingCollateral == - availableSlots * slotSize * minPricePerBytePerSecond, + availability.totalRemainingCollateral == + availableSlots * slotSize * minPricePerBytePerSecond + except HttpConnectionError: + false, timeout = 30 * 1000, ) From d9e4ef6d4b683c77c8595c7f8a572cdb6c41efb2 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Sat, 21 Jun 2025 19:26:40 +0200 Subject: [PATCH 3/3] Try ci with ubuntu only --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c045031c..f0850e77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,18 +27,18 @@ jobs: uses: fabiocaccamo/create-matrix-action@v5 with: matrix: | - os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {arm64}, builder {macos-14}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {arm64}, builder {macos-14}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {arm64}, builder {macos-14}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {arm64}, builder {macos-14}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {windows}, cpu {amd64}, builder {windows-latest}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {msys2} - os {windows}, cpu {amd64}, builder {windows-latest}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {msys2} - os {windows}, cpu {amd64}, builder {windows-latest}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {msys2} - os {windows}, cpu {amd64}, builder {windows-latest}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {msys2} + # os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {macos}, cpu {arm64}, builder {macos-14}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {macos}, cpu {arm64}, builder {macos-14}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {macos}, cpu {arm64}, builder {macos-14}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {macos}, cpu {arm64}, builder {macos-14}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + # os {windows}, cpu {amd64}, builder {windows-latest}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {msys2} + # os {windows}, cpu {amd64}, builder {windows-latest}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {msys2} + # os {windows}, cpu {amd64}, builder {windows-latest}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {msys2} + # os {windows}, cpu {amd64}, builder {windows-latest}, tests {tools}, nim_version {${{ env.nim_version }}}, shell {msys2} build: needs: matrix