Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
r0ohafza committed Dec 17, 2024
1 parent 9dfdd57 commit cb3ce21
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/1.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/10.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/11155111.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/11155420.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/7777777.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/8453.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/84532.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
2 changes: 1 addition & 1 deletion packages/smart-vaults/deployments/999999999.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C"
}
}
12 changes: 7 additions & 5 deletions packages/splits-v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ For a test run, use the following command:

To deploy split v2 contracts on a given chain, please make sure the following requirements are met:

1. Send the minimum amount of native gas token for deployment to the deployer address: `0x60C65c9a8674DA22e89C7d09e839908B9f0ecC3a`. Mainnet deployment transactions for gas cost:
1. Send the minimum amount of native gas token for deployment to the deployer address:
`0x60C65c9a8674DA22e89C7d09e839908B9f0ecC3a`. Mainnet deployment transactions for gas cost:

* [Warehouse](https://etherscan.io/tx/0x9a24df13332fafff979c35d5475be6a0594b9e8a632b1ff603150c413b7c134c)
* [Pull Splits](https://etherscan.io/tx/0xe81eb2677e597ae98c65558487693d94494e28387f2a9d76782992e4f399f44a)
* [Push Splits](https://etherscan.io/tx/0x20e8da208491560c658a25dcaa2bf37f94f26ccb4d5caaac4a346b2152818513)
- [Warehouse](https://etherscan.io/tx/0x9a24df13332fafff979c35d5475be6a0594b9e8a632b1ff603150c413b7c134c)
- [Pull Splits](https://etherscan.io/tx/0xe81eb2677e597ae98c65558487693d94494e28387f2a9d76782992e4f399f44a)
- [Push Splits](https://etherscan.io/tx/0x20e8da208491560c658a25dcaa2bf37f94f26ccb4d5caaac4a346b2152818513)

2. Support for [CreateX](https://createx.rocks/). We use createX as our deployer factory. This will ensure that the addresses match existing deployments.
2. Support for [CreateX](https://createx.rocks/). We use createX as our deployer factory. This will ensure that the
addresses match existing deployments.

3. Complete OP Code compatibility with evm version: `Shanghai`.

Expand Down
2 changes: 1 addition & 1 deletion packages/splits-v2/deployments/360.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"PullSplitFactory": "0x80f1B766817D04870f115fEBbcCADF8DBF75E017",
"PushSplitFactory": "0xaDC87646f736d6A82e9a6539cddC488b2aA07f38",
"SplitsWarehouse": "0x8fb66F38cF86A3d5e8768f8F1754A24A6c661Fb8"
}
}
1 change: 1 addition & 0 deletions packages/splits-v2/src/SplitsWarehouse.sol
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ contract SplitsWarehouse is ERC6909X {
* @param _token The address of the token to be withdrawn.
*/
function withdraw(address _owner, address _token) external {
// solhint-disable-next-line avoid-tx-origin
if (msg.sender != _owner && tx.origin != _owner) {
if (withdrawConfig[_owner].paused) {
revert WithdrawalPaused(_owner);
Expand Down
2 changes: 2 additions & 0 deletions packages/splits-v2/src/splitters/pull/PullSplit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ contract PullSplit is SplitWalletV2 {
(uint256 splitBalance, uint256 warehouseBalance) = getSplitBalance(_token);

// @solidity memory-safe-assembly
// solhint-disable-next-line no-inline-assembly
assembly {
// splitBalance -= uint(splitBalance > 0);
splitBalance := sub(splitBalance, iszero(iszero(splitBalance)))
Expand Down Expand Up @@ -108,6 +109,7 @@ contract PullSplit is SplitWalletV2 {
if (_token == NATIVE_TOKEN) {
SPLITS_WAREHOUSE.deposit{ value: _amount }({ receiver: address(this), token: _token, amount: _amount });
} else {
// solhint-disable-next-line no-empty-blocks
try SPLITS_WAREHOUSE.deposit({ receiver: address(this), token: _token, amount: _amount }) { }
catch {
IERC20(_token).forceApprove({ spender: address(SPLITS_WAREHOUSE), value: type(uint256).max });
Expand Down
1 change: 1 addition & 0 deletions packages/splits-v2/src/splitters/push/PushSplit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ contract PushSplit is SplitWalletV2 {
if (warehouseBalance > 1) withdrawFromWarehouse(_token);

// @solidity memory-safe-assembly
// solhint-disable-next-line no-inline-assembly
assembly {
// splitBalance -= uint(splitBalance > 0);
splitBalance := sub(splitBalance, iszero(iszero(splitBalance)))
Expand Down

0 comments on commit cb3ce21

Please sign in to comment.