Skip to content

feat: deploy Distributor proxy #25

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.

Sign up for GitHub

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

Merged
qcuong98 merged 1 commit into from
Oct 15, 2026
Merged

feat: deploy Distributor proxy #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion script/Base.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ contract BaseDistributorScript is BaseScript {
/// into the next chain's constructor args.
function _readEnabledHooks()
internal
view
returns (address[] memory addresses, bytes4[] memory funcSelectors)
{
(
Expand Down Expand Up @@ -165,7 +166,8 @@ contract BaseDistributorScript is BaseScript {
)
{
string memory json = _getJsonString(key);
bytes memory data = json.parseRaw(string.concat('.', vm.toString(vm.getChainId())));
string memory chainKey = _toDotChainId(vm.getChainId());
bytes memory data = json.parseRaw(json.keyExists(chainKey) ? chainKey : '.0');
Hook[] memory hooks = abi.decode(data, (Hook[]));

addresses = new address[](hooks.length);
Expand Down
2 changes: 1 addition & 1 deletion script/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from 'openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol';

contract DeployScript is BaseDistributorScript {
string internal _releaseVersion = '250718_2';
string internal _releaseVersion = '261014';

uint256 internal constant DEFAULT_TIME_LOCK = 2 hours;

Expand Down
15 changes: 7 additions & 8 deletions script/campaigns-to-create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
{
"1": [
"0x828fd6f7800a34e0e3247150844f1727accecf263b3052fbc0d94753ba032dab",
"0x4620df13f805b0f4948a11733c325a2befb35115bb121a359f5ecdaa111bfc4c"
"0x58f6e7b317782922d51addad069b6f203c9c7f5a79cb725dec4d8ef7e61282dd"
],
"42161": [
"0xa1eec86c4419bc01bf8f23f204f578c4d4c7b40e41485ddba27199c462235692"
"0xfc48ea62ecbf942537bce59dc439eb007ba92d29aba50d295106a67acefda683"
],
"8453": [
"0x9385788dc841a66c2845a4b1384c116519aef01e25433e7930ee5aec2edac6ba"
"0x0e7c69a9e37c9b058046f3ddb89d6646fd32d9919402f62d6faf33aad64763d0"
],
"56": [
"0xf1f88d9972505e16c2b6562f6861fb57e0ac86c59f7a54c0a1fd80fd40e81ed9",
"0xaa81dad65dbe8ff357c8ee89d5ed12175db45eec60deb8c21107f1e1638e4078"
"0xe59372a02cecbde2c9fb936c485a51b1fa90a3aabd2517184a0c578c63e5310c",
"0x22ffb366d81bcaba40a5e393b38ae9f29b31b6bdc5a5b11192199db349ace7d7"
],
"143": [
"0x9bc5d0273f89e44356daa934bd0cf6831a1b6022803c8f831f5c977474d21466"
"0x9fb3816cbd85a879ee9a3dc6892440d5eaa4c66b76b6b1f024476afe48d8a1c1"
],
"4663": [
"0x868077a075041c95fc544278149f8c2cf76f175f67333ba0193bd71036d23d80"
"0xb27886dbbce1b5561dfb87f79dc63378c2edcb7e3f80619ce8d093ca1dfec1d1"
]
}
21 changes: 12 additions & 9 deletions script/campaigns-to-update-root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
{
"1": [
"0x828fd6f7800a34e0e3247150844f1727accecf263b3052fbc0d94753ba032dab",
"0x4620df13f805b0f4948a11733c325a2befb35115bb121a359f5ecdaa111bfc4c"
"0x58f6e7b317782922d51addad069b6f203c9c7f5a79cb725dec4d8ef7e61282dd"
],
"42161": [
"0xf510db50b5812d02ed533c519c0277d70415374150508a9d6592bc9be025ee78",
"0xa1eec86c4419bc01bf8f23f204f578c4d4c7b40e41485ddba27199c462235692"
"0xfc48ea62ecbf942537bce59dc439eb007ba92d29aba50d295106a67acefda683"
],
"8453": [
"0x6b0c58c3c5d752b7ebba28c104e012c932fcc21683efa3b1559b4c76f1d2e0a3",
"0x9385788dc841a66c2845a4b1384c116519aef01e25433e7930ee5aec2edac6ba"
"0x0e7c69a9e37c9b058046f3ddb89d6646fd32d9919402f62d6faf33aad64763d0"
],
"56": [
"0xf1f88d9972505e16c2b6562f6861fb57e0ac86c59f7a54c0a1fd80fd40e81ed9",
"0xaa81dad65dbe8ff357c8ee89d5ed12175db45eec60deb8c21107f1e1638e4078"
"0xe59372a02cecbde2c9fb936c485a51b1fa90a3aabd2517184a0c578c63e5310c",
"0x22ffb366d81bcaba40a5e393b38ae9f29b31b6bdc5a5b11192199db349ace7d7"
],
"143": [
"0x9fb3816cbd85a879ee9a3dc6892440d5eaa4c66b76b6b1f024476afe48d8a1c1"
],
"4663": [
"0xb27886dbbce1b5561dfb87f79dc63378c2edcb7e3f80619ce8d093ca1dfec1d1"
]
}
}
7 changes: 1 addition & 6 deletions script/config/admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"1": "0xBE2F0354D970265BFc36D383af77F72736b81B54",
"56": "0xBE2F0354D970265BFc36D383af77F72736b81B54",
"8453": "0xBE2F0354D970265BFc36D383af77F72736b81B54",
"130": "0xBE2F0354D970265BFc36D383af77F72736b81B54",
"42161": "0xBE2F0354D970265BFc36D383af77F72736b81B54",
"143": "0xBE2F0354D970265BFc36D383af77F72736b81B54"
"0": "0x69694c738fE96c41ECce3588fa5759d717CF9Cc6"
}
8 changes: 8 additions & 0 deletions script/config/distributor-impl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"1": "0x0b066089B79CC6fdBf27402816b08582131d61Ae",
"143": "0x0b066089B79CC6fdBf27402816b08582131d61Ae",
"42161": "0x0b066089B79CC6fdBf27402816b08582131d61Ae",
"4663": "0x0b066089B79CC6fdBf27402816b08582131d61Ae",
"56": "0x0b066089B79CC6fdBf27402816b08582131d61Ae",
"8453": "0x0b066089B79CC6fdBf27402816b08582131d61Ae"
}
13 changes: 7 additions & 6 deletions script/config/distributor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"1": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c",
"130": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c",
"143": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c",
"42161": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c",
"56": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c",
"8453": "0xEae300Ac9409B2072697CA1d5fD137f8bB286f9c"
"0": "0x0000000000000000000000000000000000000000",
"1": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028",
"143": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028",
"42161": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028",
"4663": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028",
"56": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028",
"8453": "0x6dd1Ee8Cfe8b235C733cE278D5e4CeD92A205028"
}
53 changes: 6 additions & 47 deletions script/config/guardians.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,9 @@
{
"1": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
],
"56": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
],
"8453": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
],
"130": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
],
"42161": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
],
"143": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc",
"0x335b0100340e87d807cd2796895ca99fe74a6c59",
"0x1dcfC0de40453891C8574c8F6F7d51c67F069aD9",
"0xdbEF4Af51B49Ba2497ba16694475e109Fc374999",
"0xa322638e6891e8c4E2ab6D2F5539fB8b7931Db13",
"0x0de7dE941c89579f3C70307712Ee257b9Fd5eb9d"
"0": [
"0x69694c738fE96c41ECce3588fa5759d717CF9Cc6",
"0x56792D335D510B313FA521747559821525a459BE",
"0x2f076D7348c54d279d470BD8292650C2db7993Bf",
"0x5Fe1AC30a567e111F5e3E4d0B38d851E61Ce570B",
"0x81E1dcF43aCC593F77c7007Fe16Cc74a290b5071"
]
}
52 changes: 12 additions & 40 deletions script/config/hooks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,21 @@
{
"1": [
"0": [
{
"contractAddress": "0x0e97C887b61cCd952a53578B04763E7134429e05",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"contractAddress": "0x455C51505E90819aBdC691B98Aee6a11ED41d618",
"funcSelector": "0x8eda4ab3",
"name": "KSAllowanceHub_permit2",
"status": true
}
],
"56": [
{
"contractAddress": "0x0e97C887b61cCd952a53578B04763E7134429e05",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"status": true
}
],
"8453": [
},
{
"contractAddress": "0x0e97C887b61cCd952a53578B04763E7134429e05",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"contractAddress": "0x455C51505E90819aBdC691B98Aee6a11ED41d618",
"funcSelector": "0xea6e7a04",
"name": "KSAllowanceHub_permit",
"status": true
}
],
"130": [
{
"contractAddress": "0x0e97C887b61cCd952a53578B04763E7134429e05",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"status": true
}
],
"42161": [
{
"contractAddress": "0x0e97C887b61cCd952a53578B04763E7134429e05",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"status": true
}
],
"143": [
},
{
"contractAddress": "0x89C91686948C3Bc9A5bDF7A2A773ea71530a233e",
"funcSelector": "0xaa5d82c3",
"name": "KSZapRouterPosition",
"contractAddress": "0x3bdB21Ea8793AcBF0cE18954865b7572694d037f",
"funcSelector": "0xeb8cf626",
"name": "KSZapRouterV3",
"status": true
}
]
Expand Down
19 changes: 2 additions & 17 deletions script/config/operators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
{
"1": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
],
"56": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
],
"8453": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
],
"130": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
],
"42161": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
],
"143": [
"0x697161A9ECE8aFD6AE30946D790077050F993cbc"
"0": [
"0x56792D335D510B313FA521747559821525a459BE"
]
}
7 changes: 1 addition & 6 deletions script/config/rescuers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"1": [],
"56": [],
"8453": [],
"130": [],
"42161": [],
"143": []
"0": []
}
Loading