Merge pull request #87 from iExecBlockchainComputing/feature/remove-broker-engine-usage

Feature/remove broker engine usage

Author: james-toussaint

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### New Features
 - Enable Prometheus actuator. (#79)
 - Rework `QueueService` with a thread pool based on a `PriorityBlockingQueue`. (#84)
+- Do not use `broker` to match ordes on chain. (#87)
 ### Bug Fixes
 - Fix security rule to access Swagger API. (#79)
 ### Dependency Upgrades

build.gradle

@@ -109,11 +109,11 @@ sourceSets {
 }
 
 task itestSetup(type: Exec) {
-	commandLine 'docker-compose', 'up', '-d'
+	commandLine 'docker', 'compose', 'up', '-d'
 }
 
 task itestTeardown(type: Exec) {
-	commandLine 'docker-compose', 'down'
+	commandLine 'docker', 'compose', 'down'
 }
 
 task itest(type: Test) {

docker-compose.yml

@@ -14,22 +14,6 @@ services:
     networks:
       - iexec-blockchain-adapter-api-net
 
-  ibaa-broker:
-    image: docker-regis.iex.ec/iexec-autonomous-brokering-engine:dev #warn, using nexus repo + dev tag, can it be public?
-    container_name: ibaa-broker
-    environment:
-      - CHAIN=http://ibaa-chain:8545
-      - PROXY=0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca
-      - MNEMONIC=${BROKER_PRIVATE_KEY} #must use an other wallet for the broker, like wallet-abc
-      - PORT=3000
-    ports:
-      - 23000:3000
-    depends_on:
-      - ibaa-chain
-    networks:
-      - iexec-blockchain-adapter-api-net
-    restart: unless-stopped
-
   ibaa-blockchain-adapter-mongo:
     image: library/mongo:4.4
     container_name: ibaa-blockchain-adapter-mongo

src/itest/resources/application-itest.yml

@@ -7,4 +7,3 @@ chain:
   id: 65535
   node-address: http://localhost:28545
   hub-address: "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca"
-  broker-url: http://localhost:23000

src/main/java/com/iexec/blockchain/broker/BrokerClient.java

@@ -5,6 +5,7 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +15,7 @@
 import static com.iexec.blockchain.swagger.OpenApiConfig.SWAGGER_BASIC_AUTH;
 
 @Slf4j
+@Profile("itest")
 @RestController
 @RequestMapping("/broker")
 public class BrokerController {

src/main/java/com/iexec/blockchain/broker/BrokerController.java

@@ -16,40 +16,38 @@
 
 package com.iexec.blockchain.broker;
 
-import com.iexec.blockchain.tool.ChainConfig;
 import com.iexec.blockchain.tool.IexecHubService;
 import com.iexec.common.sdk.broker.BrokerOrder;
-import com.iexec.common.sdk.cli.FillOrdersCliOutput;
-import com.iexec.common.utils.FeignBuilder;
 import com.iexec.commons.poco.chain.ChainAccount;
+import com.iexec.commons.poco.contract.generated.IexecHubContract;
 import com.iexec.commons.poco.order.AppOrder;
 import com.iexec.commons.poco.order.DatasetOrder;
 import com.iexec.commons.poco.order.RequestOrder;
 import com.iexec.commons.poco.order.WorkerpoolOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
-import feign.Logger;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
 import java.math.BigInteger;
 import java.text.MessageFormat;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
+@Profile("itest")
 public class BrokerService {
 
-    private final BrokerClient brokerClient;
     private final IexecHubService iexecHubService;
 
 
-    public BrokerService(ChainConfig chainConfig, IexecHubService iexecHubService) {
-        //TODO Assert broker is up
+    public BrokerService(IexecHubService iexecHubService) {
         this.iexecHubService = iexecHubService;
-        this.brokerClient = FeignBuilder.createBuilder(Logger.Level.BASIC)
-                .target(BrokerClient.class, chainConfig.getBrokerUrl());
     }
 
     void checkBrokerOrder(BrokerOrder brokerOrder) {
@@ -97,7 +95,8 @@ public String matchOrders(BrokerOrder brokerOrder) {
         RequestOrder requestOrder = brokerOrder.getRequestOrder();
         final boolean withDataset = withDataset(requestOrder.getDataset());
         BigInteger datasetPrice = withDataset ? datasetOrder.getDatasetprice() : BigInteger.ZERO;
-        if (!hasRequesterAcceptedPrices(brokerOrder.getRequestOrder(),
+        if (!hasRequesterAcceptedPrices(
+                requestOrder,
                 appOrder.getAppprice(),
                 workerpoolOrder.getWorkerpoolprice(),
                 datasetPrice,
@@ -114,27 +113,51 @@ public String matchOrders(BrokerOrder brokerOrder) {
                 datasetPrice.longValue())) {
             throw new IllegalStateException("Deposit too low");
         }
-        String beneficiary = brokerOrder.getRequestOrder().getBeneficiary();
+        String beneficiary = requestOrder.getBeneficiary();
         String messageDetails = MessageFormat.format("requester:{0}, beneficiary:{1}, pool:{2}, app:{3}",
                 requestOrder.getRequester(), beneficiary, workerpoolOrder.getWorkerpool(), appOrder.getApp());
         if (withDataset) {
             messageDetails += ", dataset:" + datasetOrder.getDataset();
         }
         log.info("Matching valid orders on-chain [{}]", messageDetails);
-        return fireMatchOrders(brokerOrder).orElse("");
+        return fireMatchOrders(appOrder, datasetOrder, workerpoolOrder, requestOrder)
+                .orElse("");
     }
 
-    Optional<String> fireMatchOrders(BrokerOrder brokerOrder) {
+    Optional<String> fireMatchOrders(
+            AppOrder appOrder,
+            DatasetOrder datasetOrder,
+            WorkerpoolOrder workerpoolOrder,
+            RequestOrder requestOrder) {
         try {
-            FillOrdersCliOutput dealResponse = brokerClient.matchOrders(brokerOrder);
-            log.info("Matched orders [chainDealId:{}, tx:{}]", dealResponse.getDealid(), dealResponse.getTxHash());
-            return Optional.of(dealResponse.getDealid());
+            TransactionReceipt receipt = iexecHubService.
+                    getHubContract()
+                    .matchOrders(
+                            appOrder.toHubContract(),
+                            datasetOrder.toHubContract(),
+                            workerpoolOrder.toHubContract(),
+                            requestOrder.toHubContract()
+                    ).send();
+            log.info("block {}, hash {}, status {}", receipt.getBlockNumber(), receipt.getTransactionHash(), receipt.getStatus());
+            log.info("logs count {}", receipt.getLogs().size());
+
+            String workerpoolAddress = workerpoolOrder.getWorkerpool();
+            List<String> events = IexecHubContract.getSchedulerNoticeEvents(receipt)
+                    .stream()
+                    .filter(event -> workerpoolAddress.equals(event.workerpool))
+                    .map(event -> BytesUtils.bytesToString(event.dealid))
+                    .collect(Collectors.toList());
+            log.info("events count {}", events.size());
+            if (events.size() != 1) {
+                throw new IllegalStateException("A single deal should have been created, not " + events.size());
+            }
+            String dealId = events.get(0);
+            log.info("Matched orders [chainDealId:{}, tx:{}]", dealId, receipt.getTransactionHash());
+            return Optional.of(dealId);
         } catch (Exception e) {
             log.error("Failed to request match order [requester:{}, app:{}, workerpool:{}, dataset:{}]",
-                    brokerOrder.getRequestOrder().getRequester(),
-                    brokerOrder.getRequestOrder().getApp(),
-                    brokerOrder.getRequestOrder().getWorkerpool(),
-                    brokerOrder.getRequestOrder().getDataset(), e);
+                    requestOrder.getRequester(), requestOrder.getApp(),
+                    requestOrder.getWorkerpool(), requestOrder.getDataset(), e);
         }
         return Optional.empty();
     }

src/main/java/com/iexec/blockchain/broker/BrokerService.java

@@ -65,9 +65,6 @@ public class ChainConfig {
     @Value("${chain.gas-price-cap}")
     private long gasPriceCap;
 
-    @Value("${chain.broker-url}")
-    private String brokerUrl;
-
     @Getter(AccessLevel.NONE) // no getter
     private final Validator validator;
 

src/main/java/com/iexec/blockchain/tool/ChainConfig.java

@@ -20,11 +20,10 @@ chain:
   is-sidechain: ${IEXEC_BLOCKCHAIN_ADAPTER_API_IS_SIDECHAIN:true}
   gas-price-multiplier: ${IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_MULTIPLIER:1.0} # txs will be sent with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
   gas-price-cap: ${IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_CAP:22000000000} #in Wei, will be used for txs if networkGasPrice*gasPriceMultiplier > gasPriceCap
-  broker-url: ${IEXEC_BLOCKCHAIN_ADAPTER_API_BROKER_URL:http://localhost:3000}
 wallet:
   path: ${IEXEC_BLOCKCHAIN_ADAPTER_API_WALLET_PATH:src/main/resources/wallet.json}
   password: ${IEXEC_BLOCKCHAIN_ADAPTER_API_WALLET_PASSWORD:whatever}
 
 springdoc:
   packagesToScan: com.iexec.blockchain
-  pathsToMatch: /**
+  pathsToMatch: /**