Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Paranets #245

Merged
merged 66 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
52fc3bb
Implemented first version of ParanetsRegistry and part of the Paranet…
0xbraindevd Apr 4, 2024
d1e2a17
Added IncentivesPool deployment during Paranet registration
0xbraindevd Apr 4, 2024
6ede373
Implemented KAs/KMs Registries
0xbraindevd Apr 4, 2024
bbcc4a3
Merged main
0xbraindevd Apr 30, 2024
2be0533
Updated paranets structure, moved to V2 contracts
0xbraindevd Apr 30, 2024
401dd51
Implemented ParanetIncentivesPool, ParanetServicesRegistry, added rel…
0xbraindevd May 6, 2024
6f0d8f5
Merge branch 'main' into feature/paranets
0xbraindevd May 6, 2024
082eeff
Updated Paranet storage contracts naming, updated deployment scripts
0xbraindevd May 7, 2024
a087a16
ParanetRegister tests
Mihajlo-Pavlovic May 8, 2024
fbdd6f7
ParanetServiceRegistry tests
Mihajlo-Pavlovic May 8, 2024
f81dc65
Functioning tests
Mihajlo-Pavlovic May 9, 2024
9fab7dc
Added Paranet KAs metadata update on tokenAmount updates for KA, adde…
0xbraindevd May 9, 2024
6b3423e
Merge remote-tracking branch 'origin/feature/paranets' into test/para…
Mihajlo-Pavlovic May 9, 2024
1b6c070
Fixed msg.sender usage in Paranet storage contracts
0xbraindevd May 10, 2024
adc8f83
Merge remote-tracking branch 'origin/feature/paranets' into test/para…
Mihajlo-Pavlovic May 10, 2024
172cacb
Added check if KA is already part of other Paranet during submission
0xbraindevd May 10, 2024
3004a63
All registry tests
Mihajlo-Pavlovic May 10, 2024
a425046
Fixed restaking of the accumulated operator fee
0xbraindevd May 10, 2024
ac093a1
Reworked updated KA Paranet metadata handling, reverted back Accumula…
0xbraindevd May 11, 2024
bdf8532
Added possibility to choose amount of withdrawn/restaked accumulated …
0xbraindevd May 11, 2024
6de4ee9
Merge pull request #260 from OriginTrail/rework/update-token-amount-m…
NZT48 May 13, 2024
216052d
Paranet tests
Mihajlo-Pavlovic May 13, 2024
b70a740
Merge remote-tracking branch 'origin/feature/paranets' into test/para…
Mihajlo-Pavlovic May 13, 2024
c780879
KA minting test
Mihajlo-Pavlovic May 13, 2024
f4e7e66
Implement unit tests for updating token amounts in paranets
NZT48 May 14, 2024
ef2a1ff
Fixes and tests
Mihajlo-Pavlovic May 14, 2024
c26b7b2
Partially implemented integration tests for Paranets, fixed bugs / lo…
0xbraindevd May 14, 2024
01d6430
Added additional events for ParanetIncentivesPool
0xbraindevd May 14, 2024
076f276
Merge pull request #262 from OriginTrail/fix/incentives-pool
NZT48 May 20, 2024
e3dab59
Merge pull request #261 from OriginTrail/test/paranet-update
NZT48 May 20, 2024
f4268d4
Merge from main
NZT48 May 20, 2024
9869ffe
Resolve conflicts
NZT48 May 20, 2024
030a974
Merge pull request #259 from OriginTrail/test/paranets
NZT48 May 20, 2024
129c5a3
Resolve conflicts with KA create
NZT48 May 23, 2024
8952ecb
Fix paranet unit tests
NZT48 May 23, 2024
4c386f7
Removed not used metadata variables from registries
0xbraindevd May 30, 2024
cef0bf8
Updated ParanetIncentivesPool, removed redundant variables, adjusted …
0xbraindevd May 31, 2024
4611538
Added possibility to update NEURO emission multiplier in the incentiv…
0xbraindevd May 31, 2024
9daaa03
Merge pull request #265 from OriginTrail/update/paranets
0xbraindevd May 31, 2024
f4aaf41
Merged main
0xbraindevd May 31, 2024
1c7a196
Fixed unit tests
0xbraindevd May 31, 2024
6daf388
Deployed Paranet contracts on Neuroweb Devnet
0xbraindevd May 31, 2024
2e04924
Fixed StakingV2 unit test
0xbraindevd May 31, 2024
24537c5
Exported ABIs of Paranet contracts
0xbraindevd Jun 3, 2024
d0c0a07
Changed the way votersRegistrar is initialized in the ParanetIncentiv…
0xbraindevd Jun 4, 2024
2844cf4
Merge pull request #266 from OriginTrail/fix/voters-registrar-init
0xbraindevd Jun 4, 2024
afd2acd
Deployed Paranet contracts on Neuroweb Testnet
0xbraindevd Jun 5, 2024
ac53bd1
Deployed opFee restaking/withdrawal update on Chiado Devnet/Testnet
0xbraindevd Jun 7, 2024
72baa06
Added possibility to have multiple IncentivesPools types per Paranet,…
0xbraindevd Jun 11, 2024
7845239
Fixed comment
0xbraindevd Jun 11, 2024
512a9c6
Fixed unit tests
0xbraindevd Jun 11, 2024
c24d06e
Updated ParanetNeuroIncentivesPool following the review suggestions
0xbraindevd Jun 11, 2024
9e74134
Added unit tests for inactive stake withdrawal
0xbraindevd Jun 11, 2024
c84ab7d
Redeployed Paranet contracts on Neuroweb Devnet
0xbraindevd Jun 11, 2024
e8bd7b6
Merge pull request #267 from OriginTrail/improvement/paranets-multipool
0xbraindevd Jun 12, 2024
b5a4a24
Separated Paranet registration and ParanetIncentivesPool deployment, …
0xbraindevd Jun 12, 2024
813d7c9
Removed redundant fields in IncentivesPool struct
0xbraindevd Jun 12, 2024
61d5b7c
Redeployed Paranet logic contract on Neuroweb Devnet
0xbraindevd Jun 12, 2024
d55df4e
Redeployed Paranet contracts on Neuroweb Testnet
0xbraindevd Jun 12, 2024
08b7d23
Fixed small big with check if address is a Paranet Incentivization Pr…
0xbraindevd Jun 12, 2024
fd764d7
Merge pull request #269 from OriginTrail/fix/is-voter-fix
0xbraindevd Jun 12, 2024
c53b950
Added separate getter with calculated rewards in ParanetNeuroIncentiv…
0xbraindevd Jun 13, 2024
9f674d8
Merge pull request #268 from OriginTrail/improvement/paranet-registra…
0xbraindevd Jun 13, 2024
f52e4b5
Removed revert in favour of 0 in the ParanetNeuroIncentivesPool claim…
0xbraindevd Jun 13, 2024
d4b76e7
Redeployed Paranets contracts on Neuroweb Devnet/Testnet
0xbraindevd Jun 13, 2024
5b72863
Merge pull request #270 from OriginTrail/improvement/paranet-incentiv…
0xbraindevd Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion abi/CommitManagerV2.json
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
"name": "hub",
"outputs": [
{
"internalType": "contract Hub",
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
Expand Down
2 changes: 1 addition & 1 deletion abi/CommitManagerV2U1.json
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
"name": "hub",
"outputs": [
{
"internalType": "contract Hub",
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
Expand Down
134 changes: 119 additions & 15 deletions abi/ContentAssetV2.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"type": "uint256"
}
],
"name": "clearOldCommitsMetadata",
"name": "cancelAssetStateUpdateFromContract",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
Expand Down Expand Up @@ -421,7 +421,79 @@
}
],
"name": "createAsset",
"outputs": [],
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "originalSender",
"type": "address"
},
{
"components": [
{
"internalType": "bytes32",
"name": "assertionId",
"type": "bytes32"
},
{
"internalType": "uint128",
"name": "size",
"type": "uint128"
},
{
"internalType": "uint32",
"name": "triplesNumber",
"type": "uint32"
},
{
"internalType": "uint96",
"name": "chunksNumber",
"type": "uint96"
},
{
"internalType": "uint16",
"name": "epochsNumber",
"type": "uint16"
},
{
"internalType": "uint96",
"name": "tokenAmount",
"type": "uint96"
},
{
"internalType": "uint8",
"name": "scoreFunctionId",
"type": "uint8"
},
{
"internalType": "bool",
"name": "immutable_",
"type": "bool"
}
],
"internalType": "struct ContentAssetStructs.AssetInputArgs",
"name": "args",
"type": "tuple"
}
],
"name": "createAssetFromContract",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
Expand Down Expand Up @@ -469,7 +541,13 @@
}
],
"name": "createAssetWithVariables",
"outputs": [],
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
Expand Down Expand Up @@ -514,7 +592,7 @@
"name": "hub",
"outputs": [
{
"internalType": "contract Hub",
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
Expand Down Expand Up @@ -593,10 +671,10 @@
},
{
"inputs": [],
"name": "serviceAgreementStorageProxy",
"name": "paranetKnowledgeAssetsRegistry",
"outputs": [
{
"internalType": "contract ServiceAgreementStorageProxy",
"internalType": "contract ParanetKnowledgeAssetsRegistry",
"name": "",
"type": "address"
}
Expand All @@ -606,10 +684,10 @@
},
{
"inputs": [],
"name": "serviceAgreementV1",
"name": "paranetKnowledgeMinersRegistry",
"outputs": [
{
"internalType": "contract ServiceAgreementV1",
"internalType": "contract ParanetKnowledgeMinersRegistry",
"name": "",
"type": "address"
}
Expand All @@ -618,16 +696,42 @@
"type": "function"
},
{
"inputs": [
"inputs": [],
"name": "paranetsRegistry",
"outputs": [
{
"internalType": "bool",
"name": "_flag",
"type": "bool"
"internalType": "contract ParanetsRegistry",
"name": "",
"type": "address"
}
],
"name": "setOldMetadataClearingFlag",
"outputs": [],
"stateMutability": "nonpayable",
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "serviceAgreementStorageProxy",
"outputs": [
{
"internalType": "contract ServiceAgreementStorageProxy",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "serviceAgreementV1",
"outputs": [
{
"internalType": "contract ServiceAgreementV1",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
Expand Down
41 changes: 41 additions & 0 deletions abi/ContractStatusV2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[
{
"inputs": [],
"name": "hub",
"outputs": [
{
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bool",
"name": "_status",
"type": "bool"
}
],
"name": "setStatus",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "status",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
}
]
15 changes: 15 additions & 0 deletions abi/HubDependentV2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"inputs": [],
"name": "hub",
"outputs": [
{
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
}
]
2 changes: 1 addition & 1 deletion abi/NodeOperatorFeesStorage.json
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
"name": "hub",
"outputs": [
{
"internalType": "contract Hub",
"internalType": "contract HubV2",
"name": "",
"type": "address"
}
Expand Down
Loading
Loading