Skip to content

Commit d4278ff

Browse files
portuu3portuu3
authored
Merge pull request #1946 from humanprotocol/develop
Release S9 2024
2 parents e7325db + 441a607 commit d4278ff

File tree

143 files changed

+2421
-1453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+2421
-1453
lines changed

‎.github/workflows/cd-deploy-contracts.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
environment: deploy-contracts
2424
env:
25-
ETH_GOERLI_TESTNET_URL: ${{ secrets.ETH_GOERLI_TESTNET_URL }}
25+
ETH_SEPOLIA_TESTNET_URL: ${{ secrets.ETH_SEPOLIA_TESTNET_URL }}
2626
ETH_POLYGON_URL: ${{ secrets.ETH_POLYGON_URL }}
2727
ETH_POLYGON_AMOY_URL: ${{ secrets.ETH_POLYGON_AMOY_URL }}
2828
ETH_BSC_URL: ${{ secrets.ETH_BSC_URL }}
@@ -50,10 +50,10 @@ jobs:
5050
id: networks
5151
run: |
5252
case ${{ github.event.inputs.network }} in
53-
"goerli")
54-
echo "escrow_factory=0x87469B4f2Fcf37cBd34E54244c0BD4Fa0603664c" >> $GITHUB_OUTPUT
55-
echo "staking=0xf46B45Df3d956369726d8Bd93Ba33963Ab692920" >> $GITHUB_OUTPUT
56-
echo "reward_pool=0x0376D26246Eb35FF4F9924cF13E6C05fd0bD7Fb4" >> $GITHUB_OUTPUT
53+
"sepolia")
54+
echo "escrow_factory=0xD6D347ba6987519B4e42EcED43dF98eFf5465a23" >> $GITHUB_OUTPUT
55+
echo "staking=0x2B9C5EC6220BA8Ad08CB51A60FFdbC6a6235B203" >> $GITHUB_OUTPUT
56+
echo "reward_pool=0xAFf5a986A530ff839d49325A5dF69F96627E8D29" >> $GITHUB_OUTPUT
5757
echo "private_key=TESTNET_PRIVATE_KEY" >> $GITHUB_OUTPUT
5858
;;
5959
"polygon")

‎.github/workflows/ci-dependency-review.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: "Checkout Repository"
1212
uses: actions/[email protected]
1313
- name: "Dependency Review"
14-
uses: actions/dependency-review-action@v4.2.5
14+
uses: actions/dependency-review-action@V4.3.0

‎.github/workflows/ci-test-faucet-server.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ jobs:
1919
- uses: actions/checkout@v4
2020
- run: npm install --global yarn && yarn
2121
name: Install dependencies
22+
- run: cp .env.example .env
23+
name: Create .env file
24+
working-directory: packages/apps/faucet-server
2225
- run: yarn faucet-server:test
2326
name: Run faucet-server test

‎docs/sdk/python/human_protocol_sdk.constants.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ Enum for chain IDs.
3636

3737
#### RINKEBY *= 4*
3838

39+
#### SEPOLIA *= 11155111*
40+
3941
#### SKALE *= 1273227453*
4042

4143
### *class* human_protocol_sdk.constants.KVStoreKeys(value)

‎docs/sdk/python/human_protocol_sdk.escrow.escrow_client.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Bases: `object`
5555
#### \_\_init_\_(tx_hash, amount_refunded)
5656

5757
Represents the result of an escrow cancellation transaction.
58-
Args:
5958

60-
> tx_hash (str): The hash of the transaction that cancelled the escrow.
61-
> amount_refunded (Any): The amount refunded during the escrow cancellation.
59+
* **Parameters:**
60+
* **tx_hash** (`str`) – The hash of the transaction that cancelled the escrow.
61+
* **amount_refunded** (`any`) – The amount refunded during the escrow cancellation.
6262

6363
### *class* human_protocol_sdk.escrow.escrow_client.EscrowClient(web3)
6464

‎docs/sdk/python/human_protocol_sdk.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@
5252
* [Module](human_protocol_sdk.kvstore.kvstore_client.md#module)
5353
* [`KVStoreClient`](human_protocol_sdk.kvstore.kvstore_client.md#human_protocol_sdk.kvstore.kvstore_client.KVStoreClient)
5454
* [`KVStoreClientError`](human_protocol_sdk.kvstore.kvstore_client.md#human_protocol_sdk.kvstore.kvstore_client.KVStoreClientError)
55+
* [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
56+
* [Submodules](human_protocol_sdk.operator.md#submodules)
57+
* [human_protocol_sdk.operator.operator_utils module](human_protocol_sdk.operator.operator_utils.md)
58+
* [Code Example](human_protocol_sdk.operator.operator_utils.md#code-example)
59+
* [Module](human_protocol_sdk.operator.operator_utils.md#module)
60+
* [`LeaderData`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.LeaderData)
61+
* [`LeaderFilter`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.LeaderFilter)
62+
* [`Operator`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.Operator)
63+
* [`OperatorUtils`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.OperatorUtils)
64+
* [`OperatorUtilsError`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.OperatorUtilsError)
65+
* [`RewardData`](human_protocol_sdk.operator.operator_utils.md#human_protocol_sdk.operator.operator_utils.RewardData)
5566
* [human_protocol_sdk.staking package](human_protocol_sdk.staking.md)
5667
* [Submodules](human_protocol_sdk.staking.md#submodules)
5768
* [human_protocol_sdk.staking.staking_client module](human_protocol_sdk.staking.staking_client.md)
@@ -108,6 +119,7 @@
108119
* [`ChainId.POLYGON_AMOY`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.POLYGON_AMOY)
109120
* [`ChainId.POLYGON_MUMBAI`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.POLYGON_MUMBAI)
110121
* [`ChainId.RINKEBY`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.RINKEBY)
122+
* [`ChainId.SEPOLIA`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.SEPOLIA)
111123
* [`ChainId.SKALE`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId.SKALE)
112124
* [`KVStoreKeys`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys)
113125
* [`KVStoreKeys.fee`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.fee)

‎docs/sdk/python/human_protocol_sdk.operator.operator_utils.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Initializes an LeaderData instance.
4343
* **public_key** (`Optional`[`str`]) – Public key
4444
* **webhook_url** (`Optional`[`str`]) – Webhook url
4545
* **url** (`Optional`[`str`]) – Url
46-
* **job_types** (`Optional`[`str`]) – Job types
46+
* **job_types** (`Optional`[`List`[`str`]]) – Job types
4747

4848
### *class* human_protocol_sdk.operator.operator_utils.LeaderFilter(networks, role=None)
4949

@@ -59,11 +59,11 @@ Initializes a LeaderFilter instance.
5959
* **networks** (`List`[[`ChainId`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.ChainId)]) – Networks to request data
6060
* **role** (`Optional`[`str`]) – Leader role
6161

62-
### *class* human_protocol_sdk.operator.operator_utils.Operator(address, role, url='', job_types='')
62+
### *class* human_protocol_sdk.operator.operator_utils.Operator(address, role, url='', job_types=[])
6363

6464
Bases: `object`
6565

66-
#### \_\_init_\_(address, role, url='', job_types='')
66+
#### \_\_init_\_(address, role, url='', job_types=[])
6767

6868
Initializes an Operator instance.
6969

‎docs/sdk/python/index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ pip install human-protocol-sdk[agreement]
3232
* [Submodules](human_protocol_sdk.escrow.md#submodules)
3333
* [human_protocol_sdk.kvstore package](human_protocol_sdk.kvstore.md)
3434
* [Submodules](human_protocol_sdk.kvstore.md#submodules)
35+
* [human_protocol_sdk.operator package](human_protocol_sdk.operator.md)
36+
* [Submodules](human_protocol_sdk.operator.md#submodules)
3537
* [human_protocol_sdk.staking package](human_protocol_sdk.staking.md)
3638
* [Submodules](human_protocol_sdk.staking.md#submodules)
3739
* [human_protocol_sdk.statistics package](human_protocol_sdk.statistics.md)

‎docs/sdk/typescript/classes/base.BaseEthersClient.md‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ This class is used as a base class for other clients making on-chain calls.
5050

5151
#### Defined in
5252

53-
<<<<<<< HEAD
54-
[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
55-
=======
56-
[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
57-
>>>>>>> develop
53+
[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
5854

5955
## Properties
6056

@@ -64,11 +60,7 @@ This class is used as a base class for other clients making on-chain calls.
6460

6561
#### Defined in
6662

67-
<<<<<<< HEAD
68-
[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
69-
=======
70-
[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
71-
>>>>>>> develop
63+
[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
7264

7365
___
7466

@@ -78,8 +70,4 @@ ___
7870

7971
#### Defined in
8072

81-
<<<<<<< HEAD
82-
[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
83-
=======
84-
[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
85-
>>>>>>> develop
73+
[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)

‎docs/sdk/typescript/classes/encryption.Encryption.md‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,7 @@ Constructor for the Encryption class.
8181

8282
#### Defined in
8383

84-
<<<<<<< HEAD
85-
[encryption.ts:53](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L53)
86-
=======
87-
[encryption.ts:53](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L53)
88-
>>>>>>> develop
84+
[encryption.ts:53](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L53)
8985

9086
## Properties
9187

@@ -95,11 +91,7 @@ Constructor for the Encryption class.
9591

9692
#### Defined in
9793

98-
<<<<<<< HEAD
99-
[encryption.ts:46](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L46)
100-
=======
101-
[encryption.ts:46](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L46)
102-
>>>>>>> develop
94+
[encryption.ts:46](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L46)
10395

10496
## Methods
10597

@@ -148,11 +140,7 @@ const resultMessage = await encription.decrypt('message');
148140

149141
#### Defined in
150142

151-
<<<<<<< HEAD
152-
[encryption.ts:180](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L180)
153-
=======
154-
[encryption.ts:180](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L180)
155-
>>>>>>> develop
143+
[encryption.ts:180](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L180)
156144

157145
___
158146

@@ -188,11 +176,7 @@ const resultMessage = await encription.sign('message');
188176

189177
#### Defined in
190178

191-
<<<<<<< HEAD
192-
[encryption.ts:217](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L217)
193-
=======
194-
[encryption.ts:217](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L217)
195-
>>>>>>> develop
179+
[encryption.ts:217](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L217)
196180

197181
___
198182

@@ -254,11 +238,7 @@ const resultMessage = await encription.signAndEncrypt('message', publicKeys);
254238

255239
#### Defined in
256240

257-
<<<<<<< HEAD
258-
[encryption.ts:129](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L129)
259-
=======
260-
[encryption.ts:129](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L129)
261-
>>>>>>> develop
241+
[encryption.ts:129](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L129)
262242

263243
___
264244

@@ -283,8 +263,4 @@ Builds an Encryption instance by decrypting the private key from an encrypted pr
283263

284264
#### Defined in
285265

286-
<<<<<<< HEAD
287-
[encryption.ts:64](https://github.com/humanprotocol/human-protocol/blob/4a01940c/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L64)
288-
=======
289-
[encryption.ts:64](https://github.com/humanprotocol/human-protocol/blob/e4b60ab1/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L64)
290-
>>>>>>> develop
266+
[encryption.ts:64](https://github.com/humanprotocol/human-protocol/blob/6c59a29a/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L64)

0 commit comments

Comments
 (0)