Feat/updates

.gitignore

@@ -13,7 +13,3 @@
 /deploy/*.contracts.json
 
 !/deploy/sample.constants.json
-!/deploy/mainnet.*.constants.json
-!/deploy/mainnet.*.contracts.json
-!/deploy/arbitrum.constants.json
-!/deploy/arbitrum.contracts.json

broadcast/mainnet-production/MetamorphoExtraStrategySetup.s.sol/1/run-latest.json

@@ -0,0 +1,137 @@
+{
+  "transactions": [
+    {
+      "hash": "0x2296508471c33919c19d198d8bed8915a72736575b638fe928ca648fd138bfdb",
+      "transactionType": "CREATE",
+      "contractName": "TransparentUpgradeableProxy",
+      "contractAddress": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+      "function": null,
+      "arguments": [
+        "0xDb19e40bD45920b09Ac7fF2778d4A1cA90C0A772",
+        "0x51c8FA2c1F093AC643f6431766b1c227d869Cb6F",
+        "0x"
+      ],
+      "transaction": {
+        "type": "0x02",
+        "from": "0xedee7b1c9a240c4085a5fcac8f4fa750e3779695",
+        "gas": "0xd8f41",
+        "value": "0x0",
+        "data": "0x60806040526040516200103838038062001038833981016040819052620000269162000497565b828162000036828260006200004d565b50620000449050826200008a565b505050620005ca565b6200005883620000e5565b600082511180620000665750805b1562000085576200008383836200012760201b6200028c1760201c565b505b505050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f620000b562000156565b604080516001600160a01b03928316815291841660208301520160405180910390a1620000e2816200018f565b50565b620000f08162000244565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606200014f83836040518060600160405280602781526020016200101160279139620002f8565b9392505050565b60006200018060008051602062000ff183398151915260001b6200037760201b6200022e1760201c565b546001600160a01b0316919050565b6001600160a01b038116620001fa5760405162461bcd60e51b815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b806200022360008051602062000ff183398151915260001b6200037760201b6200022e1760201c565b80546001600160a01b0319166001600160a01b039290921691909117905550565b6200025a816200037a60201b620002b81760201c565b620002be5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401620001f1565b80620002237f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b6200037760201b6200022e1760201c565b6060600080856001600160a01b03168560405162000317919062000577565b600060405180830381855af49150503d806000811462000354576040519150601f19603f3d011682016040523d82523d6000602084013e62000359565b606091505b5090925090506200036d8683838762000389565b9695505050505050565b90565b6001600160a01b03163b151590565b60608315620003fd578251600003620003f5576001600160a01b0385163b620003f55760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620001f1565b508162000409565b62000409838362000411565b949350505050565b815115620004225781518083602001fd5b8060405162461bcd60e51b8152600401620001f1919062000595565b80516001600160a01b03811681146200045657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b838110156200048e57818101518382015260200162000474565b50506000910152565b600080600060608486031215620004ad57600080fd5b620004b8846200043e565b9250620004c8602085016200043e565b60408501519092506001600160401b0380821115620004e657600080fd5b818601915086601f830112620004fb57600080fd5b8151818111156200051057620005106200045b565b604051601f8201601f19908116603f011681019083821181831017156200053b576200053b6200045b565b816040528281528960208487010111156200055557600080fd5b6200056883602083016020880162000471565b80955050505050509250925092565b600082516200058b81846020870162000471565b9190910192915050565b6020815260008251806020840152620005b681604085016020870162000471565b601f01601f19169190910160400192915050565b610a1780620005da6000396000f3fe60806040526004361061005e5760003560e01c80635c60da1b116100435780635c60da1b146100a85780638f283970146100e6578063f851a440146101065761006d565b80633659cfe6146100755780634f1ef286146100955761006d565b3661006d5761006b61011b565b005b61006b61011b565b34801561008157600080fd5b5061006b61009036600461088b565b610135565b61006b6100a33660046108a6565b61017f565b3480156100b457600080fd5b506100bd6101f3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100f257600080fd5b5061006b61010136600461088b565b610231565b34801561011257600080fd5b506100bd61025e565b6101236102d4565b61013361012e6103ab565b6103b5565b565b61013d6103d9565b73ffffffffffffffffffffffffffffffffffffffff1633036101775761017481604051806020016040528060008152506000610419565b50565b61017461011b565b6101876103d9565b73ffffffffffffffffffffffffffffffffffffffff1633036101eb576101e68383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525060019250610419915050565b505050565b6101e661011b565b60006101fd6103d9565b73ffffffffffffffffffffffffffffffffffffffff163303610226576102216103ab565b905090565b61022e61011b565b90565b6102396103d9565b73ffffffffffffffffffffffffffffffffffffffff1633036101775761017481610444565b60006102686103d9565b73ffffffffffffffffffffffffffffffffffffffff163303610226576102216103d9565b60606102b183836040518060600160405280602781526020016109bb602791396104a5565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b6102dc6103d9565b73ffffffffffffffffffffffffffffffffffffffff163303610133576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f7879207461726760648201527f6574000000000000000000000000000000000000000000000000000000000000608482015260a4015b60405180910390fd5b600061022161052a565b3660008037600080366000845af43d6000803e8080156103d4573d6000f35b3d6000fd5b60007fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61035b5473ffffffffffffffffffffffffffffffffffffffff16919050565b61042283610552565b60008251118061042f5750805b156101e65761043e838361028c565b50505050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61046d6103d9565b6040805173ffffffffffffffffffffffffffffffffffffffff928316815291841660208301520160405180910390a16101748161059f565b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516104cf919061094d565b600060405180830381855af49150503d806000811461050a576040519150601f19603f3d011682016040523d82523d6000602084013e61050f565b606091505b5091509150610520868383876106ab565b9695505050505050565b60007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc6103fd565b61055b81610753565b60405173ffffffffffffffffffffffffffffffffffffffff8216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b73ffffffffffffffffffffffffffffffffffffffff8116610642576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016103a2565b807fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61035b80547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff9290921691909117905550565b6060831561074157825160000361073a5773ffffffffffffffffffffffffffffffffffffffff85163b61073a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016103a2565b508161074b565b61074b838361081e565b949350505050565b73ffffffffffffffffffffffffffffffffffffffff81163b6107f7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201527f6f74206120636f6e74726163740000000000000000000000000000000000000060648201526084016103a2565b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc610665565b81511561082e5781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103a29190610969565b803573ffffffffffffffffffffffffffffffffffffffff8116811461088657600080fd5b919050565b60006020828403121561089d57600080fd5b6102b182610862565b6000806000604084860312156108bb57600080fd5b6108c484610862565b9250602084013567ffffffffffffffff808211156108e157600080fd5b818601915086601f8301126108f557600080fd5b81358181111561090457600080fd5b87602082850101111561091657600080fd5b6020830194508093505050509250925092565b60005b8381101561094457818101518382015260200161092c565b50506000910152565b6000825161095f818460208701610929565b9190910192915050565b6020815260008251806020840152610988816040850160208701610929565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016919091016040019291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212204df8dd7579660e6cbf71515617566dd00436ccee41685b8933943909d1b8194c64736f6c63430008110033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564000000000000000000000000db19e40bd45920b09ac7ff2778d4a1ca90c0a77200000000000000000000000051c8fa2c1f093ac643f6431766b1c227d869cb6f00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+        "nonce": "0x34",
+        "accessList": []
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    },
+    {
+      "hash": "0x50eea8ab0aeeecca73ba75beb81f211a7414bc99459386a7afaf2a70fbe3ef19",
+      "transactionType": "CALL",
+      "contractName": "TransparentUpgradeableProxy",
+      "contractAddress": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+      "function": null,
+      "arguments": null,
+      "transaction": {
+        "type": "0x02",
+        "from": "0xedee7b1c9a240c4085a5fcac8f4fa750e3779695",
+        "to": "0xf9062a1b7bb1797dee82a1d61f0a88b2dfd765fd",
+        "gas": "0xbb3a0",
+        "value": "0x0",
+        "data": "0xed7a7d0e00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000030000000000000000000000002c25f6c25770ffec5959d34b94bf898865e5d6b10000000000000000000000000000000000c097ce7bc90715b34b9f1000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000226d6574616d6f7270686f2d6270726f746f636f6c2d666c6167736869702d757364740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "nonce": "0x35",
+        "accessList": []
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "transactionHash": "0x2296508471c33919c19d198d8bed8915a72736575b638fe928ca648fd138bfdb",
+      "transactionIndex": "0x8",
+      "blockHash": "0x3a6379943292ed0793990216dcda57a525d2e17f732b6f405f9320164dd60b00",
+      "blockNumber": "0x13480e7",
+      "from": "0xeDee7B1C9a240C4085A5fCAC8f4Fa750E3779695",
+      "to": null,
+      "cumulativeGasUsed": "0x1c827c",
+      "gasUsed": "0xa6e32",
+      "contractAddress": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+      "logs": [
+        {
+          "address": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+          "topics": [
+            "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
+            "0x000000000000000000000000db19e40bd45920b09ac7ff2778d4a1ca90c0a772"
+          ],
+          "data": "0x",
+          "blockHash": "0x3a6379943292ed0793990216dcda57a525d2e17f732b6f405f9320164dd60b00",
+          "blockNumber": "0x13480e7",
+          "transactionHash": "0x2296508471c33919c19d198d8bed8915a72736575b638fe928ca648fd138bfdb",
+          "transactionIndex": "0x8",
+          "logIndex": "0x29",
+          "removed": false
+        },
+        {
+          "address": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+          "topics": [
+            "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
+          ],
+          "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000051c8fa2c1f093ac643f6431766b1c227d869cb6f",
+          "blockHash": "0x3a6379943292ed0793990216dcda57a525d2e17f732b6f405f9320164dd60b00",
+          "blockNumber": "0x13480e7",
+          "transactionHash": "0x2296508471c33919c19d198d8bed8915a72736575b638fe928ca648fd138bfdb",
+          "transactionIndex": "0x8",
+          "logIndex": "0x2a",
+          "removed": false
+        }
+      ],
+      "status": "0x1",
+      "logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800002004000000000000000000000000008000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800080000000000000000000000000000000000000000000000000010000000000000000000020000000000000000000000000000000000400000000000000000000000000000000000000000000000000010000000000000000000000000000000000",
+      "type": "0x2",
+      "effectiveGasPrice": "0x17ce1222d"
+    },
+    {
+      "transactionHash": "0x50eea8ab0aeeecca73ba75beb81f211a7414bc99459386a7afaf2a70fbe3ef19",
+      "transactionIndex": "0x3b",
+      "blockHash": "0x0cd2a9e0d8a48a9f23a19ceac14622413add7ca6b0713887acb0c96eb12a1276",
+      "blockNumber": "0x13480e8",
+      "from": "0xeDee7B1C9a240C4085A5fCAC8f4Fa750E3779695",
+      "to": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+      "cumulativeGasUsed": "0x7cf47c",
+      "gasUsed": "0x8004b",
+      "contractAddress": null,
+      "logs": [
+        {
+          "address": "0xF9062A1b7BB1797dEe82A1D61f0a88B2dFD765Fd",
+          "topics": [
+            "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
+          ],
+          "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "blockHash": "0x0cd2a9e0d8a48a9f23a19ceac14622413add7ca6b0713887acb0c96eb12a1276",
+          "blockNumber": "0x13480e8",
+          "transactionHash": "0x50eea8ab0aeeecca73ba75beb81f211a7414bc99459386a7afaf2a70fbe3ef19",
+          "transactionIndex": "0x3b",
+          "logIndex": "0x10b",
+          "removed": false
+        }
+      ],
+      "status": "0x1",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000",
+      "type": "0x2",
+      "effectiveGasPrice": "0x181a7c88d"
+    }
+  ],
+  "libraries": [
+    "script/helper/ArraysHelper.sol:ArraysHelper:0x5665Aa09D1A8b3775024e62E82A902Ae760eebbA",
+    "src/libraries/ArrayMapping.sol:ArrayMappingUint256:0xB6B08a9ed9282c695ddFbfA81d9ebF208b4c1De0",
+    "src/libraries/ReallocationLib.sol:ReallocationLib:0x49CE6640EB2D89F80395C1a3695cc3a01b5C7bc1",
+    "src/libraries/SpoolUtils.sol:SpoolUtils:0xCB3fECd1D5eabB1b18383604A28352c17Bdfef89",
+    "src/strategies/libraries/EthFrxEthAssetGroupAdapter.sol:EthFrxEthAssetGroupAdapter:0xE23681bAA697EF5054E2D8C397ae59145027625D",
+    "src/strategies/libraries/EthStEthAssetGroupAdapter.sol:EthStEthAssetGroupAdapter:0x1516eb3a54377168b6b184326200f4258C3529dF"
+  ],
+  "pending": [],
+  "returns": {},
+  "timestamp": 1719914349,
+  "chain": 1,
+  "multi": false,
+  "commit": "4843eda"
+}

deploy/arbitrum-production.constants.json

@@ -2,30 +2,30 @@
     "assets": {
         "dai": {
             "address": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
-            "priceAggregator": { 
+            "priceAggregator": {
                 "address": "0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB",
                 "timeLimit": 86580
             }
         },
         "usdc": {
             "address": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
-            "priceAggregator": { 
+            "priceAggregator": {
                 "address": "0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3",
                 "timeLimit": 86580
             }
         },
         "usdt": {
             "address": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
-            "priceAggregator": { 
+            "priceAggregator": {
                 "address": "0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7",
                 "timeLimit": 86580
             }
         },
         "weth": {
             "address": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
-            "priceAggregator": { 
+            "priceAggregator": {
                 "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612",
-                "timeLimit": 86580 
+                "timeLimit": 86580
             }
         }
     },
@@ -70,6 +70,7 @@
         "gamma-camelot": {
             "camelotV3Router": "0x1F721E2E82F6676FCE4eA07A5958cF098D339e18",
             "weth-usdc": {
+                "clearing": "0xba58521e31E795d1AB1f27656bc12C8a9EDCFad8",
                 "hypervisor": "0xd7Ef5Ac7fd4AAA7994F3bc1D273eAb1d1013530E",
                 "nitroPool": "0x84EDB15BcBf6818879C6FDf26A69700D43100A74",
                 "narrow": {

deploy/arbitrum-production.contracts.json

@@ -103,13 +103,16 @@
     },
     "gamma-camelot": {
       "gamma-camelot-weth-usdc-narrow": "0xB5d158dc42b329214f7ecC020f715f93501a8f9e",
-      "implementation": "0x9Abe8f0EB3cBE99965a7F1E774A60A9F7fE1FF78"
+      "implementation": "0x6c2E2363393087Fdc493c0be59f5Db103c39f9c9"
     }
   },
+  "riskProviders": {
+      "spoolLabs": "0x281396fab7cadf88837c411721a5be80e57f3ebd"
+  },
   "strategy-helpers": {
     "gamma-camelot-rewards": {
       "implementation": "0xe47674A619a6d21e6c54B9A494e2E0d8416ea451",
       "weth-usdc-narrow": "0x1216944517eAffc8D31Bd238b2c56dd82b6bE534"
     }
   }
-}
+}