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

AB-723 : Standalone Royalty Claiming contract #26

Merged
merged 43 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a0afbe8
init abclaim contract
0xPilou Nov 16, 2023
d2322a9
IERC721AB interface
0xPilou Nov 21, 2023
9372adc
update ABClaim draft
0xPilou Nov 21, 2023
2cbd757
improve ABClaim
0xPilou Jan 9, 2024
945e720
improved ABClaim
0xPilou Jan 18, 2024
48c86b6
added deposit royalty functions
0xPilou Jan 18, 2024
a802d99
Merge branch 'dev' into ab723-newRoyalty
0xPilou Jan 18, 2024
b575824
fine tune ABClaim
0xPilou Jan 18, 2024
af83270
added setDrop function
0xPilou Jan 19, 2024
c8076a8
add USDC to initializer
0xPilou Jan 19, 2024
476a0f2
init draft abClaim unit tests
0xPilou Jan 19, 2024
7c28558
cache
0xPilou Jan 19, 2024
c1666cf
added test coverage
0xPilou Jan 19, 2024
16bf7f4
update coverage
0xPilou Jan 22, 2024
4e7c493
bug fix
0xPilou Jan 22, 2024
21d00f7
improve coverage
0xPilou Jan 22, 2024
55a3e2e
add getClaimableAmount per token
0xPilou Jan 22, 2024
5ce6a99
updated unit tests
0xPilou Jan 22, 2024
a2b9ac7
deploy script
0xPilou Jan 29, 2024
8edb533
utils script
0xPilou Jan 29, 2024
e411795
deploy & execs
0xPilou Jan 29, 2024
72fee02
added signature check in beforeRoyaltyClaim hook
0xPilou Jan 29, 2024
c82d132
added kyc sig in tests
0xPilou Jan 29, 2024
2835260
add events upon updating holdings
0xPilou Feb 1, 2024
9e73edd
disable signature check for royalty claiming
0xPilou Feb 1, 2024
d9859c0
cache
0xPilou Feb 1, 2024
94f8c9b
added events
0xPilou Feb 5, 2024
f004918
added events
0xPilou Feb 12, 2024
5c2e9dc
add base sepolia config
0xPilou Feb 12, 2024
9816375
tx & deploys
0xPilou Feb 12, 2024
6dfbf39
updated conf
0xPilou Feb 12, 2024
31d1bdf
new deploy
0xPilou Feb 12, 2024
4bac185
new deploy
0xPilou Feb 12, 2024
ba26285
remove unused
0xPilou Feb 13, 2024
ca370d2
base deploy script
0xPilou Feb 13, 2024
d6925b4
abClaim base deploy
0xPilou Feb 13, 2024
c466bc3
added fuzz assert in Claim tests
0xPilou Feb 13, 2024
4ecba8b
new multiclam function with test
asserules Feb 20, 2024
010adc0
storing local lenght
asserules Feb 20, 2024
168c15e
new base sepolia deploy
0xPilou Feb 21, 2024
3aec95e
added comments
0xPilou Feb 21, 2024
2822ed1
add fuzz test params checks
0xPilou Feb 21, 2024
d99367e
Merge pull request #27 from Anotherblock/ab-911-fixed-the-graph-event…
asserules Feb 21, 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
54 changes: 54 additions & 0 deletions broadcast/deploy-abClaim.s.sol/8453/run-1707816602.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/8453/run-1707816682.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/8453/run-1707816689.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/8453/run-1707816722.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/8453/run-latest.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705934084.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705934090.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705934123.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705935307.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705935314.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1705935347.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707128174.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707128180.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707128213.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707488246.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707488253.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-1707488286.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84531/run-latest.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707735971.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707735977.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736204.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736211.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736355.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736362.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736565.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736571.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736588.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736594.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736642.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736649.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736685.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736691.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736724.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736746.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736753.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736777.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736783.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1707736801.json

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1708505108.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1708505115.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-1708505148.json

Large diffs are not rendered by default.

174 changes: 174 additions & 0 deletions broadcast/deploy-abClaim.s.sol/84532/run-latest.json

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions broadcast/setDropData.s.sol/84531/run-1705934894.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"transactions": [
{
"hash": "0xae8e5836255921dab3d46562628020c8b5b6f34db74ee78175bf167921bf66fe",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0xd1131db6adb3ce19a86ff69f02fc9200f69f0275",
"gas": "0x19cc6",
"value": "0x0",
"data": "0x4c5b07fb0000000000000000000000000000000000000000000000000000000000004e690000000000000000000000002b5974e07331f3d1dcff454c1ff4b4481e5385de0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f",
"nonce": "0x53e",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [],
"libraries": [],
"pending": [
"0xae8e5836255921dab3d46562628020c8b5b6f34db74ee78175bf167921bf66fe"
],
"returns": {},
"timestamp": 1705934894,
"chain": 84531,
"multi": false,
"commit": "5ce6a99"
}
49 changes: 49 additions & 0 deletions broadcast/setDropData.s.sol/84531/run-1705934900.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"transactions": [
{
"hash": "0xae8e5836255921dab3d46562628020c8b5b6f34db74ee78175bf167921bf66fe",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0xd1131db6adb3ce19a86ff69f02fc9200f69f0275",
"gas": "0x19cc6",
"value": "0x0",
"data": "0x4c5b07fb0000000000000000000000000000000000000000000000000000000000004e690000000000000000000000002b5974e07331f3d1dcff454c1ff4b4481e5385de0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f",
"nonce": "0x53e",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"transactionHash": "0xae8e5836255921dab3d46562628020c8b5b6f34db74ee78175bf167921bf66fe",
"transactionIndex": "0x1",
"blockHash": "0xf40020645419401dc7414f1fe859c58204340c0dca5bf1e82deb8bcd3051bf51",
"blockNumber": "0xea8990",
"from": "0xD71256eC24925873cE9E9F085f89864Ca05970bD",
"to": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"cumulativeGasUsed": "0x1e1d1",
"gasUsed": "0x12ad8",
"contractAddress": null,
"logs": [],
"status": "0x1",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"effectiveGasPrice": "0xb2d05efe"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1705934900,
"chain": 84531,
"multi": false,
"commit": "5ce6a99"
}
34 changes: 34 additions & 0 deletions broadcast/setDropData.s.sol/84531/run-1705934957.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"transactions": [
{
"hash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0xd1131db6adb3ce19a86ff69f02fc9200f69f0275",
"gas": "0x1f634",
"value": "0x0",
"data": "0x3b6907d80000000000000000000000000000000000000000000000000000000000004e690000000000000000000000000000000000000000000000000000000000e4e1c0",
"nonce": "0x53f",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [],
"libraries": [],
"pending": [
"0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128"
],
"returns": {},
"timestamp": 1705934957,
"chain": 84531,
"multi": false,
"commit": "5ce6a99"
}
93 changes: 93 additions & 0 deletions broadcast/setDropData.s.sol/84531/run-1705934964.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"transactions": [
{
"hash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0xd1131db6adb3ce19a86ff69f02fc9200f69f0275",
"gas": "0x1f634",
"value": "0x0",
"data": "0x3b6907d80000000000000000000000000000000000000000000000000000000000004e690000000000000000000000000000000000000000000000000000000000e4e1c0",
"nonce": "0x53f",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"transactionHash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionIndex": "0x1",
"blockHash": "0xe6733265e02b0050c05fb85d8a8e4f6756c5e6fe4c6d48175728dada5efc2102",
"blockNumber": "0xea89af",
"from": "0xD71256eC24925873cE9E9F085f89864Ca05970bD",
"to": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"cumulativeGasUsed": "0x22284",
"gasUsed": "0x16b97",
"contractAddress": null,
"logs": [
{
"address": "0x5d1c51346908e017dDE0007A5DB8F1394dFFAaD5",
"topics": [
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
"0x000000000000000000000000d71256ec24925873ce9e9f085f89864ca05970bd",
"0x000000000000000000000000d1131db6adb3ce19a86ff69f02fc9200f69f0275"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000e4e1c0",
"blockHash": "0xe6733265e02b0050c05fb85d8a8e4f6756c5e6fe4c6d48175728dada5efc2102",
"blockNumber": "0xea89af",
"transactionHash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionIndex": "0x1",
"logIndex": "0x0",
"removed": false
},
{
"address": "0x5d1c51346908e017dDE0007A5DB8F1394dFFAaD5",
"topics": [
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
"0x000000000000000000000000d71256ec24925873ce9e9f085f89864ca05970bd",
"0x000000000000000000000000d1131db6adb3ce19a86ff69f02fc9200f69f0275"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0xe6733265e02b0050c05fb85d8a8e4f6756c5e6fe4c6d48175728dada5efc2102",
"blockNumber": "0xea89af",
"transactionHash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionIndex": "0x1",
"logIndex": "0x1",
"removed": false
},
{
"address": "0xd1131db6ADb3CE19a86ff69f02fc9200f69F0275",
"topics": [
"0x8ed3543c92c7106a56f0a6cdaa716fef62211f99d6630ecd4dc1231d9edae811"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000004e690000000000000000000000000000000000000000000000000000000000e4e1c0",
"blockHash": "0xe6733265e02b0050c05fb85d8a8e4f6756c5e6fe4c6d48175728dada5efc2102",
"blockNumber": "0xea89af",
"transactionHash": "0xae4d7e2d34ec8cbecddeb9cf7ac65ae50c0e4c4cbb499c367edce23b19fd9128",
"transactionIndex": "0x1",
"logIndex": "0x2",
"removed": false
}
],
"status": "0x1",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000020000080100000000000000000000000000000000000000000000000000200000080000000000000000000008004000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000092000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000200000000000000000000800002008000000000000000000000000000000000000000000000000000080010000000000000000000000400000020000000000000000000000000000000",
"type": "0x2",
"effectiveGasPrice": "0xb2d05efe"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1705934964,
"chain": 84531,
"multi": false,
"commit": "5ce6a99"
}
55 changes: 55 additions & 0 deletions broadcast/setDropData.s.sol/84531/run-1705935451.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"transactions": [
{
"hash": "0x5e0c4c65de557ddb3854b5c6bc3bc742e489af6574fafc4472e0e82332e186f0",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0x47Af0b5B9175001A769B8d36416577778706E112",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0x47af0b5b9175001a769b8d36416577778706e112",
"gas": "0x19cc6",
"value": "0x0",
"data": "0x4c5b07fb0000000000000000000000000000000000000000000000000000000000004e690000000000000000000000002b5974e07331f3d1dcff454c1ff4b4481e5385de0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f",
"nonce": "0x545",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
},
{
"hash": "0x953fab9c33e940abeb647439bf5b8382afca22ce97edf7b4a9d4e1cf9cc1050c",
"transactionType": "CALL",
"contractName": "TransparentUpgradeableProxy",
"contractAddress": "0x47Af0b5B9175001A769B8d36416577778706E112",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd71256ec24925873ce9e9f085f89864ca05970bd",
"to": "0x47af0b5b9175001a769b8d36416577778706e112",
"gas": "0x1f634",
"value": "0x0",
"data": "0x3b6907d80000000000000000000000000000000000000000000000000000000000004e690000000000000000000000000000000000000000000000000000000000e4e1c0",
"nonce": "0x546",
"accessList": []
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [],
"libraries": [],
"pending": [
"0x5e0c4c65de557ddb3854b5c6bc3bc742e489af6574fafc4472e0e82332e186f0",
"0x953fab9c33e940abeb647439bf5b8382afca22ce97edf7b4a9d4e1cf9cc1050c"
],
"returns": {},
"timestamp": 1705935451,
"chain": 84531,
"multi": false,
"commit": "5ce6a99"
}
Loading
Loading