Skip to content

335 referral system#197

Open
quent043 wants to merge 100 commits intomainfrom
335-referral_system
Open

335 referral system#197
quent043 wants to merge 100 commits intomainfrom
335-referral_system

Conversation

@quent043
Copy link
Copy Markdown
Contributor

@quent043 quent043 commented May 30, 2023

New PR:

Useful info

  • Trello:
  • Description:

Auto-Review checklist

  • Check if there is no merge conflict
  • If you have new .env variable, check if you add it in the .env.example file

Typing

  • Check lint feedbacks: npm run lint
  • Check prettier format feedbacks: npm run format

quent043 added 2 commits May 30, 2023 17:21
@quent043
First draft on TalentLayerServiceV2.sol
ed6d77d 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
First draft on TalentLayerEscrowV2.sol
8ad8fda 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043 quent043 requested a review from 0xRomain May 30, 2023 16:25
quent043 added 27 commits May 31, 2023 14:39
@quent043
Added new functions in TalentLayerServiceV2.sol
25d5f65 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added new functions in TalentLayerServiceV2.sol
a71195c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Removed fields from tests
1683046 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated updateService function
7407a52 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated tests
d083d9c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated delegation tests
b630bc5 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated audit tests
f3bfa51 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated load tests
d72be64 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated platform verification tests
fe78b13 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated pausable escrow verification tests
4e3e1c6 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated delegation tests
2265b07 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Revers commit on original contracts
e5ae868 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated serviceCompletion.ts tests
035a392 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated disputeResolution.ts tests
338c460 
& fixed a bug

Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added tests for new functions.
f52e7e5 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added an event
5f4aab5 
Updated tests

Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated tests with events emissions
f9a6de8 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added missing assertions + event assertions
14c6fee 
Added new events tests

Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Fixed nat spec
d8d6f0c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added indexed in event
68e8c23 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Refactored Contract upgrades naming & organization
b37c9c7 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Refactored tests to fit new naming
6ca051f 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added new function to TalentLayerService.sol contract
e02ba9d 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated tests
6133da9 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Renamed contract variable
cc3e7ed 
Added test assertion

Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added new test for new function
392fa20 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added id check
7ed97d8 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated tests with correct tests + args
a74368d 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043 quent043 added the NEED REVIEW Dev is waiting for peer review label Jun 19, 2023
0xRomain
0xRomain reviewed Jun 19, 2023
View reviewed changes
contracts/TalentLayerService.sol Outdated
ProposalStatus status,
address rateToken,
uint256 rateAmount,
uint256 amount,
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jun 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rateAmount

0xRomain
0xRomain reviewed Jun 19, 2023
View reviewed changes
contracts/TalentLayerService.sol Outdated
address rateToken,
uint256 rateAmount,
uint256 expirationDate
uint256 amount,
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jun 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rateAmount

0xRomain
0xRomain reviewed Jun 19, 2023
View reviewed changes
contracts/TalentLayerEscrow.sol Outdated
*/
function getClaimableReferralBalance(address _token) external view returns (uint256 balance) {
uint256 referrerId = talentLayerIdContract.ids(_msgSender());
talentLayerIdContract.isValid(referrerId);
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jun 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not need to do isValid, will return 0 if not valid

quent043 added 11 commits June 20, 2023 09:10
@quent043
Removed isValid check for referral balance view
a3e49af 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
amount => rateAmount
4d60193 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Remove require statement
8263d23 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added deploy script for V1 upgrade test
6c2113c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
First draft on V1 migration test
fd2022c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added tests on services 1 & 2
7f9bd58 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added tests on services 3
31010fc 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Revert address update
05a458c 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Finalized referral upgrade tests
7f94981 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Final check on Escrow NatSpec
f25d1b5 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Final check on Service NatSpec
f4d13f0 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
0xRomain
0xRomain reviewed Jul 17, 2023
View reviewed changes
.openzeppelin/polygon-mumbai.json Outdated
"c980df0f3f2d12ed5c153d563a1fbbb3da4380540f0f81a91a88015668a2090b": {
"address": "0xB60f8b4f06B66ecc75806cC5bbfc17b6eF8e56D7",
"txHash": "0xbe5bd8de2d13887a8f6109045d69507b8ab9e16cb1875656b2ca746af012603f",
"452eb25e1c135f95b329252e20212c01eb69015592373af7097bb11bb44a9ae1": {
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these updates must not be pushed unless it's the official Mumbai contracts of TL

0xRomain
0xRomain reviewed Jul 17, 2023
View reviewed changes
contracts/TalentLayerEscrow.sol Outdated
* @notice Allows a referrer to claim its tokens & / or ETH balance.
* @param _referrerId The ID of the referrer claiming the balance.
* @param _tokenAddress The address of the Token contract (address(0) if balance in ETH).
* @dev Emits a BalanceTransferred & a ReferralAmountClaimed events
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BalanceTransferred ?

0xRomain
0xRomain reviewed Jul 17, 2023
View reviewed changes
contracts/TalentLayerEscrow.sol Outdated
) private view returns (uint256 totalEscrowAmount) {
return
totalEscrowAmount =
_amount +
Copy link
Copy Markdown
Contributor

@0xRomain 0xRomain Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realize there is an issue here. The system can only work if we are taking the same fees that we do today on the _amount, for the _referralAmount. With fees it becomes sybil resistant
So here, _originServiceFeeRate, _originValidatedProposalFeeRate and _originValidatedProposalFeeRate should be applied to _referralAmount

quent043 added 11 commits July 26, 2023 11:31
@quent043
Updated Escrow contract to modify fee calculation
5fed205 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Updated tests
118fa86 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Reverted changes in json files
8f90926 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Update Natspec
7f84e7a 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Merge main
cf3b865 
Signed-off-by: Quentin D.C <quent043@hotmail.com>
@quent043
Added missing + !
0de07fc
@quent043
Updated updateService function
be86269
@quent043
Updated Playground
fcd1153
@quent043
Reverted updateService change
797bd99
@quent043
Added optimizations to Service variable calls
ba0c363
@quent043
Fixed error
51bd676
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@0xRomain 0xRomain 0xRomain left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

NEED REVIEW Dev is waiting for peer review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@quent043 @0xRomain