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

[WIP] V8 paranet update #335

Merged
merged 185 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
39ada60
Naive imeplementation of owenr check
Mihajlo-Pavlovic Jan 14, 2025
c73f36c
More optimal _checkKnowledgeCollectionOwner function
Mihajlo-Pavlovic Jan 14, 2025
8a7eaf3
Enable submitKnowledgeAsset
Mihajlo-Pavlovic Jan 14, 2025
1587741
Rewrite mintet and burned count getting
Mihajlo-Pavlovic Jan 14, 2025
742b51f
change text
Mihajlo-Pavlovic Jan 15, 2025
a78a28c
Fix typo
Mihajlo-Pavlovic Jan 15, 2025
958aaa2
Update ParanetknowledgeCollectionIdRegistry
Mihajlo-Pavlovic Jan 15, 2025
706d455
Rename asset to collection
Mihajlo-Pavlovic Jan 15, 2025
e261fb8
Rename fix typos
Mihajlo-Pavlovic Jan 15, 2025
53826dc
Fix renaming
Mihajlo-Pavlovic Jan 16, 2025
3e74894
fixes
Mihajlo-Pavlovic Jan 16, 2025
a214adf
Fix _updateSubmittedKnowledgeCollectionMetadata
Mihajlo-Pavlovic Jan 16, 2025
f4cb2eb
Make paranet easier to count and discover
Mihajlo-Pavlovic Jan 17, 2025
d7f28e6
Add getKnowledgeCollectionLocators batch getter
Mihajlo-Pavlovic Jan 17, 2025
faf7551
getKnowledgeCollectionLocatorsWithPagination
Mihajlo-Pavlovic Jan 17, 2025
50aa467
Update ParanetNeuroIncentivesPool & ParanetIncentivesPoolFactory
Mihajlo-Pavlovic Jan 17, 2025
c08c20c
Remove unused import from ParanetIncentivesPoolFactory
Mihajlo-Pavlovic Jan 17, 2025
c631a53
Update KnowledgeCollection with paranet features
Mihajlo-Pavlovic Jan 17, 2025
5d413c1
Implement suggested changes from review
Mihajlo-Pavlovic Jan 17, 2025
f6351fe
Renamve ParanetLib.knowledgeCollection to ParanetLib.KnowledgeCollection
Mihajlo-Pavlovic Jan 17, 2025
5022156
wip
Mihajlo-Pavlovic Jan 17, 2025
7ed374f
Add comments
Mihajlo-Pavlovic Jan 17, 2025
e896651
Update state infor in paranet on submit and update
Mihajlo-Pavlovic Jan 20, 2025
c44f28d
Change merkleRoots to memory
Mihajlo-Pavlovic Jan 20, 2025
631ac4d
Update ABI
Mihajlo-Pavlovic Jan 20, 2025
f97063a
Update deployment script & ABIs exports
Mihajlo-Pavlovic Jan 20, 2025
57e3c2b
Remove unused import
Mihajlo-Pavlovic Jan 20, 2025
3e90db0
Add debugevent
Mihajlo-Pavlovic Jan 21, 2025
a9ad1ac
Add debugevent
Mihajlo-Pavlovic Jan 21, 2025
7cf3d64
Add local logs
Mihajlo-Pavlovic Jan 21, 2025
50779d7
Remove debug code and fix how _checkKnowledgeCollectionOwner is calcu…
Mihajlo-Pavlovic Jan 21, 2025
70ea1f6
Update _checkKnowledgeCollectionOwner in ParanetIncentivesPoolFactory
Mihajlo-Pavlovic Jan 21, 2025
bdb071a
Change reverte msg
Mihajlo-Pavlovic Jan 21, 2025
e847d00
Version bump
Mihajlo-Pavlovic Jan 22, 2025
b3ce1bc
Fix isParanetOperator in ParanetNeuroIncentivesPool
Mihajlo-Pavlovic Jan 22, 2025
6fbacb2
Update deployments
Mihajlo-Pavlovic Jan 22, 2025
7ae367e
Remove update
Mihajlo-Pavlovic Jan 24, 2025
59a6281
Update ABI
Mihajlo-Pavlovic Jan 24, 2025
300217f
Base tesnted KC redeployed
Mihajlo-Pavlovic Jan 24, 2025
1cf1396
wip
Mihajlo-Pavlovic Jan 24, 2025
0dfb4b1
Update deployment files
Mihajlo-Pavlovic Jan 24, 2025
c74bddf
wip
Mihajlo-Pavlovic Jan 24, 2025
87ee0d7
Update services
Mihajlo-Pavlovic Jan 24, 2025
1715370
wip
Mihajlo-Pavlovic Jan 30, 2025
668f725
Fix paranetId calculation in incentives pool deployment
Jan 30, 2025
3f3819f
Merge pull request #337 from OriginTrail/v8/fix-incentives-pool-addre…
zsculac Jan 30, 2025
fd5ea3f
Merge remote-tracking branch 'origin/fix/remove-kc-update' into paran…
Mihajlo-Pavlovic Jan 30, 2025
01dfb90
fix removeVoters
Mihajlo-Pavlovic Jan 31, 2025
41d94aa
Fix submit
Mihajlo-Pavlovic Jan 31, 2025
4da11a2
Merge pull request #338 from OriginTrail/paranet-from-KA
Mihajlo-Pavlovic Jan 31, 2025
8dc1364
Update deployment
Mihajlo-Pavlovic Jan 31, 2025
1acb39f
Add KC epoch created check
Mihajlo-Pavlovic Feb 3, 2025
90a95be
Remove increaseKnowledgeCollectionTokenAmount
Mihajlo-Pavlovic Feb 3, 2025
bf82b47
Add ABI
Mihajlo-Pavlovic Feb 3, 2025
c963a04
Initial contracts
Mihajlo-Pavlovic Feb 7, 2025
b623890
wip
Mihajlo-Pavlovic Feb 10, 2025
cc58cb2
wip
Mihajlo-Pavlovic Feb 10, 2025
e69463f
Copy multiplier from old contract when redeploying
Mihajlo-Pavlovic Feb 10, 2025
04ac3f9
Add events for storage
Mihajlo-Pavlovic Feb 11, 2025
f6e326f
remove events
Mihajlo-Pavlovic Feb 11, 2025
c7c21f2
fixes
Mihajlo-Pavlovic Feb 11, 2025
3925bd5
Rename UniversalCollectionLocator to UniversalAssetCollectionLocator
Mihajlo-Pavlovic Feb 11, 2025
f9fb318
Rename ParanetLib.KnowledgeCollectionIsAPartOfOtherParanet to Paranet…
Mihajlo-Pavlovic Feb 11, 2025
051e950
Add unit tests to Epoch Storage
Feb 11, 2025
d01474a
Add Chronos unit tests
Feb 11, 2025
d2e09ea
Add Chronos unit tests
Feb 11, 2025
bba5dae
Fix check if voter already exists in addVoters
Mihajlo-Pavlovic Feb 11, 2025
e299779
If voter doesn't exist, getter reverts
Mihajlo-Pavlovic Feb 11, 2025
54eb61c
revert if index out of bounds
Mihajlo-Pavlovic Feb 11, 2025
8f65ccd
Fixed require condition for index out of bounds check
Mihajlo-Pavlovic Feb 11, 2025
f7ff318
Fix voter.lenght checks
Mihajlo-Pavlovic Feb 11, 2025
5acfe82
Remove redundant variables
Mihajlo-Pavlovic Feb 11, 2025
7cdd320
Add todo comment
Mihajlo-Pavlovic Feb 11, 2025
81ad920
Knowledge collection unit tests
Feb 12, 2025
7312b48
Add support for multiple incentives pools
Mihajlo-Pavlovic Feb 12, 2025
90ac328
Fix _checkSender in ParanetKnowledgeMinersRegistry
Mihajlo-Pavlovic Feb 12, 2025
1cc6979
Rename IParanetNeuroIncentivesPool function
Mihajlo-Pavlovic Feb 12, 2025
37d3c1e
Add amount to claimKnowledgeMinerReward function
Mihajlo-Pavlovic Feb 12, 2025
fcf0d4b
remove unused argument from deployNeuroIncentivesPool
Mihajlo-Pavlovic Feb 12, 2025
a2f8c3b
Add not 0 address check to transferVotersRegistrarRole
Mihajlo-Pavlovic Feb 12, 2025
67ccaa0
Revert changes
Mihajlo-Pavlovic Feb 12, 2025
988a399
Type and function names fixes
Mihajlo-Pavlovic Feb 12, 2025
d250078
Fix check for kc epoch
Mihajlo-Pavlovic Feb 12, 2025
aa80160
Add checkERC20Compliance
Mihajlo-Pavlovic Feb 12, 2025
a2fa370
rework removeVoters
Mihajlo-Pavlovic Feb 12, 2025
524fdbb
Add KC helpers
Feb 12, 2025
2bc7b7e
Add profile helpers
Feb 12, 2025
0bc8082
Adapt Knowledge Collection tests
Feb 12, 2025
a851597
Remove unused import
Mihajlo-Pavlovic Feb 13, 2025
8300953
Merge pull request #339 from OriginTrail/feature/add-check-for-KC-sta…
Mihajlo-Pavlovic Feb 13, 2025
88b1068
Improve kc and profile helper functions
Feb 13, 2025
1605af2
Remove commit
Mihajlo-Pavlovic Feb 13, 2025
dced0fc
Add KnowledgeCollectionStaged
Mihajlo-Pavlovic Feb 13, 2025
1fef82f
Create paranet integration tests
Feb 13, 2025
bfa9dd1
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 13, 2025
c5d3cf5
Remove enums for paranet policies
Mihajlo-Pavlovic Feb 13, 2025
4f737ae
Reduce factory size
Mihajlo-Pavlovic Feb 13, 2025
cf2863a
Update helper functions for easier setup
Feb 13, 2025
2110a56
Update KC tests
Feb 13, 2025
fd8fc06
Add incentives pool deployment test and update helpers
Feb 13, 2025
a391b18
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 13, 2025
0cdd976
Add ParanetIncentivesPoolFactoryHelper
Mihajlo-Pavlovic Feb 14, 2025
7f2e81a
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 14, 2025
1f3759f
Makde curators discoverable
Mihajlo-Pavlovic Feb 14, 2025
dc533b9
Update deployer script
Mihajlo-Pavlovic Feb 14, 2025
6b46deb
Add deployer scripts
Mihajlo-Pavlovic Feb 14, 2025
02c890e
Fix missing '
Mihajlo-Pavlovic Feb 14, 2025
34a2efe
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 14, 2025
7cf0232
Update reviewKnowledgeCollection to to add KC to collection
Mihajlo-Pavlovic Feb 14, 2025
4f59650
remove Neuro references
Mihajlo-Pavlovic Feb 14, 2025
5b1ae4f
Fix redeployIncentivesPool require
Mihajlo-Pavlovic Feb 14, 2025
cf11b66
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 14, 2025
f55bcd1
Merge pull request #345 from OriginTrail/remove-neuro-reference-from-…
Mihajlo-Pavlovic Feb 14, 2025
1c4633c
Merge branch 'v8/ParanetIncentivesPool-rework' into feature/paranet-s…
Mihajlo-Pavlovic Feb 14, 2025
2cab456
Merge pull request #344 from OriginTrail/feature/paranet-staging
Mihajlo-Pavlovic Feb 14, 2025
7d41a5c
Merge pull request #342 from OriginTrail/v8/ParanetIncentivesPool-rework
Mihajlo-Pavlovic Feb 14, 2025
655d678
fixes
Mihajlo-Pavlovic Feb 14, 2025
3bad0d1
Merge branch 'v8/ParanetIncentivesPool-rework' into v8/unit-tests
Feb 14, 2025
05cf0c3
Merge branch 'v8-paranet-update' into v8/ParanetIncentivesPool-rework
Mihajlo-Pavlovic Feb 14, 2025
d009749
Merge pull request #346 from OriginTrail/v8/ParanetIncentivesPool-rework
Mihajlo-Pavlovic Feb 14, 2025
ca91f2c
Fix variable naming
Feb 14, 2025
47c7c9a
Merge branch 'v8-paranet-update' into v8/unit-tests
Feb 14, 2025
76a81f6
fix naming and missing error type
Feb 14, 2025
d3bda3b
Merge branch 'v8-paranet-update' into v8/unit-tests
Feb 14, 2025
9a35e23
Fix hasIncentivesPoolByName and hasIncentivesPoolByStorageAddress
Feb 14, 2025
514a00c
Merge branch 'v8-paranet-update' into v8/unit-tests
Feb 14, 2025
c01b13b
Change facotry events
Mihajlo-Pavlovic Feb 14, 2025
1da4123
Remove ERC20 check from IncentiveStorage
Mihajlo-Pavlovic Feb 14, 2025
67490d6
Merge branch 'v8-paranet-update' into v8/unit-tests
Feb 14, 2025
05b2389
Add new paranet tests and update old
Feb 14, 2025
7be2103
Update abis
Mihajlo-Pavlovic Feb 14, 2025
02270b2
Merge branch 'v8-paranet-update' into v8/unit-tests
Feb 14, 2025
5115bc4
Fix deployer function
Mihajlo-Pavlovic Feb 14, 2025
588b34b
deployments update
Mihajlo-Pavlovic Feb 14, 2025
3b84160
Fix KC epoch check
Mihajlo-Pavlovic Feb 14, 2025
1fe8493
redeploy paranet
Mihajlo-Pavlovic Feb 14, 2025
f695c9c
Merge branch 'v8-paranet-update' into v8/unit-tests
Mihajlo-Pavlovic Feb 18, 2025
b50e0c9
Add tests and fixes
Mihajlo-Pavlovic Feb 18, 2025
91f8e74
Should not allow approving a rejected knowledge collection test
Mihajlo-Pavlovic Feb 18, 2025
d8f201f
Add fixes and tests
Mihajlo-Pavlovic Feb 18, 2025
b45f5d2
Add fixes and tests
Mihajlo-Pavlovic Feb 18, 2025
9d480b5
Add IERC20Extended interface
Feb 19, 2025
f621960
Add new contract abi
Feb 19, 2025
16b9085
Tests and fixes
Mihajlo-Pavlovic Feb 19, 2025
5eeef4d
Add incentive test
Mihajlo-Pavlovic Feb 19, 2025
b8dcfeb
IERC20Extended inherits from IERC20
Feb 19, 2025
7d43bc9
Update abi
Feb 19, 2025
f7fcaad
Rename
Mihajlo-Pavlovic Feb 19, 2025
e11392d
renaming
Mihajlo-Pavlovic Feb 19, 2025
93710a9
Comment out permissioned function
Mihajlo-Pavlovic Feb 19, 2025
56ef8d8
Fix incentive pool reward claiming
Feb 20, 2025
a41d0ff
Fail to claim rewards when pool has no funds
Feb 20, 2025
4875223
Add validation to deployIncentivesPool
Feb 20, 2025
d670d5b
Fix hasIncentivesPoolByName
Feb 20, 2025
333a052
Add more incentives pool tests
Feb 20, 2025
c5dd07b
Fix getVoter require
Feb 21, 2025
211e973
Add 'Should handle voter management correctly' test
Feb 21, 2025
1bc36ef
Fix redeployIncentivesPool function
Feb 21, 2025
357e4c4
Remove unnecessary imports
Feb 21, 2025
d78456d
Add 'Should handle incentives pool redeployment' test
Feb 21, 2025
c640839
Add missing revert messages to require statements
Feb 21, 2025
6e84c7b
Add 'Should handle token emission multiplier updates correctly' test
Feb 21, 2025
e812e18
Fix naming
Mihajlo-Pavlovic Feb 21, 2025
3431105
Merge pull request #348 from OriginTrail/rename-curated-to-permisioned
Mihajlo-Pavlovic Feb 21, 2025
d0050a4
Fix hasIncentivesPoolByStorageAddress function
Feb 21, 2025
1405a3e
Add more checks to existing tests
Feb 21, 2025
ff28438
Add tests for multiple incentive contracts
Mihajlo-Pavlovic Feb 21, 2025
8d80da8
remove only
Mihajlo-Pavlovic Feb 21, 2025
c192f73
Improve pool and pool storage test coverage
Feb 24, 2025
ef0dcde
Add more coverage tests
Feb 24, 2025
e27a890
Comment out permissioned tests
Feb 24, 2025
ead10df
Move tests to the same section
Feb 24, 2025
08b0282
Update paranet metadata tests
Feb 24, 2025
2d3ea6c
Add Paranet service metadata tests
Feb 24, 2025
90ea01f
remove only
Feb 25, 2025
f827022
Merge pull request #347 from OriginTrail/v8/incentive-token-decimals
Mihajlo-Pavlovic Feb 26, 2025
3d079dd
Merge pull request #343 from OriginTrail/v8/unit-tests
Mihajlo-Pavlovic Feb 26, 2025
1044949
Merge pull request #340 from OriginTrail/remove-remove-increaseKnowle…
Mihajlo-Pavlovic Feb 26, 2025
88de7ee
Add tokenOrigin
Mihajlo-Pavlovic Feb 26, 2025
a627be9
Add ABI
Mihajlo-Pavlovic Feb 26, 2025
4090f41
Add access modifier to Paranet.sol contracts
Mihajlo-Pavlovic Feb 26, 2025
ab554b3
Merge pull request #349 from OriginTrail/feature/add-token-origin
Mihajlo-Pavlovic Feb 26, 2025
8949e18
Merge pull request #350 from OriginTrail/add-access-modifiers-to-cons…
Mihajlo-Pavlovic Feb 26, 2025
ddf7a6a
Review fixes
Mihajlo-Pavlovic Feb 26, 2025
c6cd370
Update ABI
Mihajlo-Pavlovic Feb 26, 2025
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
198 changes: 198 additions & 0 deletions abi/IERC20Extended.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
[
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "spender",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
},
{
"inputs": [
{
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"internalType": "address",
"name": "spender",
"type": "address"
}
],
"name": "allowance",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "spender",
"type": "address"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "approve",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "balanceOf",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "decimals",
"outputs": [
{
"internalType": "uint8",
"name": "",
"type": "uint8"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "totalSupply",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "to",
"type": "address"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "transfer",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "from",
"type": "address"
},
{
"internalType": "address",
"name": "to",
"type": "address"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "transferFrom",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "nonpayable",
"type": "function"
}
]
15 changes: 15 additions & 0 deletions abi/IParanetIncentivesPool.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"inputs": [],
"name": "getParanetIncentivesPoolStorage",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
}
]
Loading
Loading