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

Feat/multisig deploy scripts #398

Open
wants to merge 58 commits into
base: feat/multisig-wrapper
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e0115c9
feat: other testnets df migration
arthcp Jul 16, 2024
05d374b
chore: upload s3
arthcp Jul 16, 2024
0dafff3
2.18.0
arthcp Jul 19, 2024
abd253b
feat: mantle read calls fix
arthcp Jul 22, 2024
4a084dd
feat: disabledDFFeeChains list
arthcp Jul 22, 2024
67e9497
feat: connect new plugs after migrate
arthcp Jul 22, 2024
81ba9b5
feat: migrate mainnets
arthcp Jul 22, 2024
88e5dac
chore: version bump
arthcp Jul 22, 2024
aa78d78
feat: migrate mode
arthcp Jul 23, 2024
2b5f825
feat: winr and polynomial full migrate
arthcp Jul 24, 2024
68f97ce
feat: add trip roles for hexagate kms
ameeshaagrawal Jul 25, 2024
23b39b4
Merge pull request #392 from SocketDotTech/remaining-df-migration
arthcp Jul 25, 2024
00865a6
Merge pull request #393 from SocketDotTech/fix/global-trip-role
ameeshaagrawal Jul 25, 2024
885f579
chore: update dl common
ameeshaagrawal Jul 29, 2024
0fed4c2
Merge branch 'feat/multisig-wrapper' into feat/multisig-deploy-scripts
ameeshaagrawal Jul 30, 2024
2717951
feat: added overrides in dl core and s3
tHeMaskedMan981 Jul 30, 2024
007f0dc
feat: socket signer
ameeshaagrawal Jul 30, 2024
702341c
fix: remove unused events
ameeshaagrawal Jul 30, 2024
593c831
feat: use socket signer in scripts
ameeshaagrawal Jul 30, 2024
fc27591
Merge pull request #396 from SocketDotTech/feat/overrides
tHeMaskedMan981 Aug 7, 2024
5ee958f
feat: deploy neox chains
arthcp Aug 7, 2024
ae26002
Merge remote-tracking branch 'origin/master'
arthcp Aug 7, 2024
751832c
chore: publish and upload
arthcp Aug 7, 2024
f82dbd8
fix: signer types
ameeshaagrawal Aug 15, 2024
71e4a93
fix: wrapper and tests
ameeshaagrawal Aug 20, 2024
8c5628d
feat: kinto df migrate
arthcp Aug 21, 2024
2c539c3
chore: bump versions
arthcp Aug 21, 2024
77109fa
feat: version bump and all path fix
arthcp Aug 22, 2024
3699464
feat: code support for bungee chains
arthcp Aug 22, 2024
08df4c7
feat: mantle override fixes
arthcp Aug 26, 2024
966cb98
feat: configs
arthcp Aug 26, 2024
af8f43e
feat: bungee chains deployment
arthcp Aug 26, 2024
c708e4a
feat: enable kinto df
arthcp Aug 26, 2024
2a1fa47
fix: order tx in scripts
ameeshaagrawal Aug 27, 2024
21736dd
fix: add method to reset nonce
ameeshaagrawal Aug 28, 2024
28e27df
feat: gnosis linea verify
arthcp Aug 29, 2024
9eb497a
feat: linea finality and version bumps
arthcp Aug 29, 2024
4c0de30
feat: add base sepolia
ameeshaagrawal Aug 29, 2024
f346119
fix: wrapper contract
ameeshaagrawal Aug 29, 2024
93f95b7
fix: scripts
ameeshaagrawal Aug 29, 2024
70a5535
feat: change override logic and add default 5% multiplier
arthcp Sep 3, 2024
8c6b764
feat: bungee chains
arthcp Sep 3, 2024
3781aae
fix: bungee chain fixes
arthcp Sep 12, 2024
50f252d
feat: connect winr chains, xlayer
arthcp Sep 12, 2024
7331563
feat: contract verify and df migrate
arthcp Sep 12, 2024
888ac7d
Merge pull request #397 from SocketDotTech/bungee-chains
arthcp Sep 16, 2024
da43ebc
Merge branch 'master' into feat/multisig-deploy-scripts
arthcp Sep 16, 2024
36b6d83
fix: chains input
arthcp Sep 16, 2024
81a8de1
fix: remove unused deps
ameeshaagrawal Sep 16, 2024
7afef7d
fix: signer
ameeshaagrawal Sep 16, 2024
a89752b
fix: remove unused deps
ameeshaagrawal Sep 16, 2024
e982520
fix: remove waffle
ameeshaagrawal Sep 16, 2024
75c6dc7
feat: nominate owner
ameeshaagrawal Sep 16, 2024
ab38bed
feat: claim with multisig
ameeshaagrawal Sep 16, 2024
ec100e3
feat: multisig for opt, arb, sepolia testnets
arthcp Sep 19, 2024
5965e59
feat: deploy proxy factory and socket safe
ameeshaagrawal Oct 17, 2024
8160668
feat: deploy safe proxy
arthcp Oct 18, 2024
0e8ee47
feat: script changes for safe proxy
arthcp Oct 25, 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
18 changes: 16 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ OPTIMISM_SEPOLIA_RPC=''
POLYGON_RPC='https://rpc.ankr.com/polygon'
POLYGON_MUMBAI_RPC='https://matic-mumbai.chainstacklabs.com'

AVAX_RPC='https://api.avax.network/ext/bc/C/rpc'

BSC_RPC='https://bsc-dataseed1.binance.org'
BSC_TESTNET_RPC='https://data-seed-prebsc-1-s1.binance.org:8545'

Expand Down Expand Up @@ -91,3 +89,19 @@ DL_API_DEV_URL=''
DL_API_PROD_URL=''

NEOX_TESTNET_RPC=' '

NEOX_T4_TESTNET_RPC=' '

NEOX_RPC=' '

GNOSIS_RPC=' '

LINEA_RPC=' '

ZKEVM_RPC=' '

AVALANCHE_RPC=' '

XLAYER_RPC=' '

BASE_SEPOLIA_RPC=' '
17 changes: 6 additions & 11 deletions chainConfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
{
"8453": {
"roleOwners": {
"ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
"ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
"executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
"transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
"watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
"feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5"
},
"siblings": [1, 137, 42161, 10, 56, 34443],
"overrides": {
"type": 1,
"gasLimit": 3000000,
"gasPrice": 10000000
}
"siblings": [1, 137, 42161, 10, 56, 34443]
},
"31337": {
"siblings": [],
Expand All @@ -26,7 +21,7 @@
},
"34443": {
"roleOwners": {
"ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
"ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
"executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
"transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
"watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
Expand All @@ -41,7 +36,7 @@
},
"60808": {
"roleOwners": {
"ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
"ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
"executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
"transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
"watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
Expand All @@ -52,7 +47,7 @@
},
"444444": {
"roleOwners": {
"ownerAddress": "0x78Deb9225c3F28D12922913Fec978e4dC90E1aa4",
"ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
"executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
"transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
"watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
Expand All @@ -63,7 +58,7 @@
},
"2863311531": {
"roleOwners": {
"ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34",
"ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
"executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9",
"transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5",
"watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14",
Expand Down
26 changes: 13 additions & 13 deletions contracts/mocks/MockSafe.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ contract MockSafe {
address to,
uint256 value,
bytes calldata data,
Enum.Operation operation,
uint256 safeTxGas,
uint256 baseGas,
uint256 gasPrice,
address gasToken,
address payable refundReceiver,
bytes memory signatures
Enum.Operation,
uint256,
uint256,
uint256,
address,
address payable,
bytes memory
) external payable returns (bool success) {
lastTo = to;
lastValue = value;
Expand All @@ -41,13 +41,13 @@ contract MockSafe {
uint256 value,
bytes calldata data,
Enum.Operation operation,
uint256 safeTxGas,
uint256 baseGas,
uint256 gasPrice,
address gasToken,
address refundReceiver,
uint256,
uint256,
uint256,
address,
address,
uint256 _nonce
) external view returns (bytes32) {
) external pure returns (bytes32) {
return keccak256(abi.encode(to, value, data, operation, _nonce));
}

Expand Down
10 changes: 5 additions & 5 deletions contracts/socket/SocketBatcher.sol
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ contract SocketBatcher is AccessControl {
IExecutionManager.setRelativeNativeTokenPrice.selector
) {
IExecutionManager(contractAddress_).setRelativeNativeTokenPrice(
setFeesRequests_[index].nonce,
setFeesRequests_[index].dstChainSlug,
setFeesRequests_[index].fees,
setFeesRequests_[index].signature
);
setFeesRequests_[index].nonce,
setFeesRequests_[index].dstChainSlug,
setFeesRequests_[index].fees,
setFeesRequests_[index].signature
);
} else if (
setFeesRequests_[index].functionSelector ==
IExecutionManager.setMsgValueMaxThreshold.selector
Expand Down
250 changes: 0 additions & 250 deletions contracts/utils/MultiSigWrapper.sol

This file was deleted.

Loading
Loading