diff --git a/packages/smart-vaults/deployments/1.json b/packages/smart-vaults/deployments/1.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/1.json +++ b/packages/smart-vaults/deployments/1.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/10.json b/packages/smart-vaults/deployments/10.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/10.json +++ b/packages/smart-vaults/deployments/10.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/11155111.json b/packages/smart-vaults/deployments/11155111.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/11155111.json +++ b/packages/smart-vaults/deployments/11155111.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/11155420.json b/packages/smart-vaults/deployments/11155420.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/11155420.json +++ b/packages/smart-vaults/deployments/11155420.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/7777777.json b/packages/smart-vaults/deployments/7777777.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/7777777.json +++ b/packages/smart-vaults/deployments/7777777.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/8453.json b/packages/smart-vaults/deployments/8453.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/8453.json +++ b/packages/smart-vaults/deployments/8453.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/84532.json b/packages/smart-vaults/deployments/84532.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/84532.json +++ b/packages/smart-vaults/deployments/84532.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/smart-vaults/deployments/999999999.json b/packages/smart-vaults/deployments/999999999.json index 2833395..d71a174 100644 --- a/packages/smart-vaults/deployments/999999999.json +++ b/packages/smart-vaults/deployments/999999999.json @@ -1,3 +1,3 @@ { "SmartVaultFactory": "0x8E6Af8Ed94E87B4402D0272C5D6b0D47F0483e7C" -} \ No newline at end of file +} diff --git a/packages/splits-v2/README.md b/packages/splits-v2/README.md index 16a7b55..59ffa30 100644 --- a/packages/splits-v2/README.md +++ b/packages/splits-v2/README.md @@ -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`. diff --git a/packages/splits-v2/deployments/360.json b/packages/splits-v2/deployments/360.json index ccaf35d..bbfcccc 100644 --- a/packages/splits-v2/deployments/360.json +++ b/packages/splits-v2/deployments/360.json @@ -2,4 +2,4 @@ "PullSplitFactory": "0x80f1B766817D04870f115fEBbcCADF8DBF75E017", "PushSplitFactory": "0xaDC87646f736d6A82e9a6539cddC488b2aA07f38", "SplitsWarehouse": "0x8fb66F38cF86A3d5e8768f8F1754A24A6c661Fb8" -} \ No newline at end of file +} diff --git a/packages/splits-v2/src/SplitsWarehouse.sol b/packages/splits-v2/src/SplitsWarehouse.sol index a50125b..11a801a 100644 --- a/packages/splits-v2/src/SplitsWarehouse.sol +++ b/packages/splits-v2/src/SplitsWarehouse.sol @@ -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); diff --git a/packages/splits-v2/src/splitters/pull/PullSplit.sol b/packages/splits-v2/src/splitters/pull/PullSplit.sol index 2939b1c..e49f0f6 100644 --- a/packages/splits-v2/src/splitters/pull/PullSplit.sol +++ b/packages/splits-v2/src/splitters/pull/PullSplit.sol @@ -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))) @@ -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 }); diff --git a/packages/splits-v2/src/splitters/push/PushSplit.sol b/packages/splits-v2/src/splitters/push/PushSplit.sol index 2ed0a54..c5a22c9 100644 --- a/packages/splits-v2/src/splitters/push/PushSplit.sol +++ b/packages/splits-v2/src/splitters/push/PushSplit.sol @@ -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)))