@human-protocol/sdk 1.0.26 → 1.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@human-protocol/sdk",
   "description": "Human Protocol SDK",
-  "version": "1.0.26",
+  "version": "1.1.1",
   "files": [
     "src",
     "dist",
@@ -14,7 +14,7 @@
     "clean": "rm -rf ./dist",
     "build": "npm run clean && tsc",
     "prepublish": "npm run build",
-    "test": "concurrently -k -s first -g --hide 0 \"yarn workspace @human-protocol/core local\" \"sleep 5 && jest --runInBand\"",
+    "test": "concurrently -k -s first -g --hide 0 \"yarn workspace @human-protocol/core local\" \"sleep 10 && jest --runInBand\"",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier --write '**/*.{ts,json}'"
@@ -45,8 +45,5 @@
     "ethers": "^5.7.2",
     "secp256k1": "^4.0.3",
     "winston": "^3.8.2"
-  },
-  "peerDependencies": {
-    "@human-protocol/core": "^1.0.12"
   }
 }

package/src/job.ts

@@ -104,7 +104,7 @@ export class Job {
           alchemy: alchemyKey,
           infura: infuraKey,
         })
-      : new ethers.providers.JsonRpcProvider();
+      : new ethers.providers.JsonRpcProvider('http://127.0.0.1:8545');
 
     this.providerData = {
       provider,
@@ -191,7 +191,6 @@ export class Job {
 
       this._logger.info('Deploying escrow factory...');
       this.contractData.factory = await deployEscrowFactory(
-        this.contractData.hmTokenAddr,
         this.contractData.stakingAddr,
         this.providerData?.gasPayer
       );
@@ -317,6 +316,7 @@ export class Job {
 
     try {
       const txReceipt = await this.contractData?.factory?.createEscrow(
+        this.contractData.hmTokenAddr,
         this.providerData?.trustedHandlers?.map(
           (trustedHandler) => trustedHandler.address
         ) || []
@@ -385,6 +385,8 @@ export class Job {
       this.manifestData?.manifest?.reputation_oracle_addr || '';
     const recordingOracleAddr =
       this.manifestData?.manifest?.recording_oracle_addr || '';
+    const requestedSolutions =
+      this.manifestData?.manifest?.job_total_tasks || 0;
 
     this._logger.info(
       `Transferring ${this.amount} HMT to ${this.contractData.escrow.address}...`
@@ -438,7 +440,8 @@ export class Job {
       reputationOracleStake,
       recordingOracleStake,
       this.manifestData?.manifestlink?.url,
-      this.manifestData?.manifestlink?.hash
+      this.manifestData?.manifestlink?.hash,
+      requestedSolutions
     );
 
     if (!contractSetup) {

package/src/utils.ts

@@ -34,19 +34,18 @@ export const getHmToken = async (
 /**
  * **Deploy EscrowFactory contract**
  *
- * @param {string} hmTokenAddr HMToken address
  * @param {string} stakingAddr Staking address
  * @param {ethers.Signer | undefined} signer Deployer signer
  * @returns {Promise<EscrowFactory>} Deployed contract instance
  */
 export const deployEscrowFactory = async (
-  hmTokenAddr: string,
   stakingAddr: string,
   signer?: ethers.Signer
 ): Promise<EscrowFactory> => {
   const factory = new EscrowFactory__factory(signer);
 
-  const contract = await factory.deploy(hmTokenAddr, stakingAddr);
+  const contract = await factory.deploy();
+  await contract.initialize(stakingAddr);
 
   return contract;
 };
@@ -103,7 +102,8 @@ export const deployStaking = async (
   signer?: ethers.Signer
 ): Promise<Staking> => {
   const staking = new Staking__factory(signer);
-  const contract = await staking.deploy(hmTokenAddr, minimumStake, lockPeriod);
+  const contract = await staking.deploy();
+  await contract.initialize(hmTokenAddr, minimumStake, lockPeriod);
 
   return contract;
 };
@@ -142,7 +142,8 @@ export const deployRewardPool = async (
   signer?: ethers.Signer
 ): Promise<RewardPool> => {
   const rewardPool = new RewardPool__factory(signer);
-  const contract = await rewardPool.deploy(hmTokenAddr, stakingAddr, fee);
+  const contract = await rewardPool.deploy();
+  await contract.initialize(hmTokenAddr, stakingAddr, fee);
 
   return contract;
 };

package/test/job.test.ts

@@ -47,7 +47,7 @@ describe('Test Job', () => {
         manifest: manifest,
         hmTokenAddr: DEFAULT_HMTOKEN_ADDR,
         stakingAddr: DEFAULT_STAKING_ADDR,
-        logLevel: 'error',
+        logLevel: 'debug',
       });
     });
 

package/test/utils/constants.ts

@@ -2,7 +2,7 @@ export const DEFAULT_HMTOKEN_ADDR =
   '0x5FbDB2315678afecb367f032d93F642f64180aa3';
 
 export const DEFAULT_STAKING_ADDR =
-  '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512';
+  '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0';
 
 export const DEFAULT_GAS_PAYER_ADDR =
   '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266';