Merge pull request #1093 from humanprotocol/develop

Release 20231019

Author: leric7

.github/dependabot.yml

@@ -21,3 +21,10 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "develop"
+
+  # Maintain dependencies for rust
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "develop"

packages/apps/job-launcher/server/src/app.module.ts

@@ -13,6 +13,8 @@ import { JobModule } from './modules/job/job.module';
 import { PaymentModule } from './modules/payment/payment.module';
 import { Web3Module } from './modules/web3/web3.module';
 import { envValidator } from './common/config';
+import { ServeStaticModule } from '@nestjs/serve-static';
+import { join } from 'path';
 
 @Module({
   providers: [
@@ -40,6 +42,9 @@ import { envValidator } from './common/config';
     JobModule,
     PaymentModule,
     Web3Module,
+    ServeStaticModule.forRoot({
+      rootPath: join(__dirname, '../../../../../', 'node_modules/swagger-ui-dist'),
+    }),
   ],
   controllers: [AppController],
 })

packages/apps/job-launcher/server/src/main.ts

@@ -64,15 +64,7 @@ async function bootstrap() {
     .setVersion('1.0')
     .build();
   const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('swagger', app, document, {
-    customJs: [
-      'https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui-bundle.min.js',
-      'https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui-standalone-preset.min.js',
-    ],
-    customCssUrl: [
-      'https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui.min.css',
-    ],
-  });
+  SwaggerModule.setup('swagger', app, document);
 
   const host = configService.get<string>(ConfigNames.HOST, 'localhost');
   const port = +configService.get<string>(ConfigNames.PORT, '5000');

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/escrow.py

@@ -109,6 +109,7 @@ def __init__(
         reputation_oracle: Optional[str] = None,
         recording_oracle: Optional[str] = None,
         exchange_oracle: Optional[str] = None,
+        job_requester_id: Optional[str] = None,
         status: Optional[Status] = None,
         date_from: Optional[datetime] = None,
         date_to: Optional[datetime] = None,
@@ -154,6 +155,7 @@ def __init__(
         self.reputation_oracle = reputation_oracle
         self.recording_oracle = recording_oracle
         self.exchange_oracle = exchange_oracle
+        self.job_requester_id = job_requester_id
         self.status = status
         self.date_from = date_from
         self.date_to = date_to
@@ -888,10 +890,16 @@ def get_escrows(
                 network["subgraph_url"],
                 query=get_escrows_query(filter),
                 params={
-                    "launcher": filter.launcher,
-                    "reputationOracle": filter.reputation_oracle,
-                    "recordingOracle": filter.recording_oracle,
-                    "exchangeOracle": filter.exchange_oracle,
+                    "launcher": filter.launcher.lower() if filter.launcher else None,
+                    "reputationOracle": filter.reputation_oracle.lower()
+                    if filter.reputation_oracle
+                    else None,
+                    "recordingOracle": filter.recording_oracle.lower()
+                    if filter.recording_oracle
+                    else None,
+                    "exchangeOracle": filter.exchange_oracle.lower()
+                    if filter.exchange_oracle
+                    else None,
                     "jobRequesterId": filter.job_requester_id,
                     "status": filter.status.name if filter.status else None,
                     "from": int(filter.date_from.timestamp())
@@ -964,7 +972,7 @@ def get_escrow(
             network["subgraph_url"],
             query=get_escrow_query(),
             params={
-                "escrowAddress": escrow_address,
+                "escrowAddress": escrow_address.lower(),
             },
         )
 

packages/sdk/python/human-protocol-sdk/human_protocol_sdk/staking.py

@@ -430,7 +430,7 @@ def get_rewards_info(self, slasher: str) -> List[dict]:
         reward_added_events_data = get_data_from_subgraph(
             self.network["subgraph_url"],
             query=get_reward_added_events_query,
-            params={"slasherAddress": slasher},
+            params={"slasherAddress": slasher.lower()},
         )
         reward_added_events = reward_added_events_data["data"]["rewardAddedEvents"]
 

packages/sdk/typescript/human-protocol-sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@human-protocol/sdk",
   "description": "Human Protocol SDK",
-  "version": "1.0.9",
+  "version": "1.1.16",
   "files": [
     "src",
     "dist"
@@ -48,6 +48,7 @@
     "graphql-request": "^6.1.0",
     "graphql-tag": "^2.12.6",
     "minio": "^7.0.32",
+    "openpgp": "^5.10.2",
     "secp256k1": "^4.0.3",
     "vitest": "^0.30.1",
     "winston": "^3.8.2"

packages/sdk/typescript/human-protocol-sdk/src/escrow.ts

@@ -1543,6 +1543,10 @@ export class EscrowUtils {
           GET_ESCROWS_QUERY(filter),
           {
             ...filter,
+            launcher: filter.launcher?.toLowerCase(),
+            reputationOracle: filter.reputationOracle?.toLowerCase(),
+            recordingOracle: filter.recordingOracle?.toLowerCase(),
+            exchangeOracle: filter.exchangeOracle?.toLowerCase(),
             status: filter.status
               ? Object.entries(EscrowStatus).find(
                   ([, value]) => value === filter.status
@@ -1646,7 +1650,7 @@ export class EscrowUtils {
       const { escrow } = await gqlFetch<{ escrow: EscrowData }>(
         networkData.subgraphUrl,
         GET_ESCROW_BY_ADDRESS_QUERY(),
-        { escrowAddress }
+        { escrowAddress: escrowAddress.toLowerCase() }
       );
 
       return escrow || null;

packages/sdk/typescript/human-protocol-sdk/src/index.ts

@@ -3,6 +3,7 @@ import { StorageClient } from './storage';
 import { KVStoreClient } from './kvstore';
 import { EscrowClient, EscrowUtils } from './escrow';
 import { StatisticsClient } from './statistics';
+import { Encryption, EncryptionUtils } from './encryption';
 
 export * from './constants';
 export * from './types';
@@ -16,4 +17,6 @@ export {
   EscrowClient,
   EscrowUtils,
   StatisticsClient,
+  Encryption,
+  EncryptionUtils,
 };

packages/sdk/typescript/human-protocol-sdk/src/staking.ts

@@ -575,7 +575,7 @@ export class StakingClient {
       const { leader } = await gqlFetch<{
         leader: ILeader;
       }>(this.network.subgraphUrl, GET_LEADER_QUERY, {
-        address,
+        address: address.toLowerCase(),
       });
 
       return leader;
@@ -687,7 +687,7 @@ export class StakingClient {
       const { rewardAddedEvents } = await gqlFetch<{
         rewardAddedEvents: RewardAddedEventData[];
       }>(this.network.subgraphUrl, GET_REWARD_ADDED_EVENTS_QUERY, {
-        slasherAddress,
+        slasherAddress: slasherAddress.toLowerCase(),
       });
 
       return rewardAddedEvents.map((reward: any) => {