Fix repo configuration

primitivefinance · Feb 20, 2024 · 483a883 · 483a883
1 parent bb13ccf
commit 483a883
Show file tree

Hide file tree

Showing 154 changed files with 101 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,5 @@
 [submodule "lib/solstat"]
 	path = lib/solstat
-	url = https://github.com/primitivefinance/solstat
+  url = https://github.com/primitivefinance/solstat
+  branch = "update-forge-std"
+
diff --git a/cache/solidity-files-cache.json b/cache/solidity-files-cache.json
diff --git a/foundry.toml b/foundry.toml
@@ -9,8 +9,6 @@ solc_version = "0.8.22"
 # these are defaults. explicitly setting them here for clarity.
 libs = ["lib"]
 out = "out/"
-src = "src/"
-test = "src/test/"
 
 [fmt]
 bracket_spacing = true

diff --git a/out/Allocate.t.sol/DFMMAllocateTest.json b/out/Allocate.t.sol/DFMMAllocateTest.json
diff --git a/out/Allocate.t.sol/G3MAllocateTest.json b/out/Allocate.t.sol/G3MAllocateTest.json
diff --git a/out/Allocate.t.sol/LogNormalAllocateTest.json b/out/Allocate.t.sol/LogNormalAllocateTest.json
diff --git a/out/ArbMath.sol/ArbMath.json b/out/ArbMath.sol/ArbMath.json
diff --git a/out/ArbiterToken.sol/ArbiterToken.json b/out/ArbiterToken.sol/ArbiterToken.json
diff --git a/out/AtomicV2.sol/AtomicV2.json b/out/AtomicV2.sol/AtomicV2.json
diff --git a/out/AtomicV2.sol/LiquidExchange.json b/out/AtomicV2.sol/LiquidExchange.json
diff --git a/out/AtomicV2.sol/StrategyLike.json b/out/AtomicV2.sol/StrategyLike.json
diff --git a/out/AtomicV2.sol/TokenLike.json b/out/AtomicV2.sol/TokenLike.json
diff --git a/out/Base.sol/CommonBase.json b/out/Base.sol/CommonBase.json
diff --git a/out/Base.sol/ScriptBase.json b/out/Base.sol/ScriptBase.json
diff --git a/out/Base.sol/TestBase.json b/out/Base.sol/TestBase.json
diff --git a/out/BisectionLib.sol/BisectionLib.json b/out/BisectionLib.sol/BisectionLib.json
diff --git a/out/Coin.sol/Coin.json b/out/Coin.sol/Coin.json
diff --git a/out/ConstantSum.sol/ConstantSum.json b/out/ConstantSum.sol/ConstantSum.json
diff --git a/out/ConstantSumLib.sol/ConstantSumLib.json b/out/ConstantSumLib.sol/ConstantSumLib.json
diff --git a/out/ConstantSumSolver.sol/ConstantSumSolver.json b/out/ConstantSumSolver.sol/ConstantSumSolver.json
diff --git a/out/ConstantSumTest.t.sol/ConstantSumTest.json b/out/ConstantSumTest.t.sol/ConstantSumTest.json
diff --git a/out/Constructor.t.sol/DFMMConstructorTest.json b/out/Constructor.t.sol/DFMMConstructorTest.json
diff --git a/out/DFMM.sol/DFMM.json b/out/DFMM.sol/DFMM.json
diff --git a/out/Deallocate.t.sol/DFMMDeallocateTest.json b/out/Deallocate.t.sol/DFMMDeallocateTest.json
diff --git a/out/Deallocate.t.sol/G3MDeallocateTest.json b/out/Deallocate.t.sol/G3MDeallocateTest.json
diff --git a/out/Deallocate.t.sol/LogNormalDeallocateTest.json b/out/Deallocate.t.sol/LogNormalDeallocateTest.json
diff --git a/out/Deployment.s.sol/DeploymentScript.json b/out/Deployment.s.sol/DeploymentScript.json
diff --git a/out/DynamicParamLib.sol/DynamicParamLib.json b/out/DynamicParamLib.sol/DynamicParamLib.json
diff --git a/out/DynamicParamLib.t.sol/DynamicParamLibTest.json b/out/DynamicParamLib.t.sol/DynamicParamLibTest.json
diff --git a/out/ERC20.sol/ERC20.json b/out/ERC20.sol/ERC20.json
diff --git a/out/FixedPointMathLib.sol/FixedPointMathLib.json b/out/FixedPointMathLib.sol/FixedPointMathLib.json
diff --git a/out/G3M.sol/G3M.json b/out/G3M.sol/G3M.json
diff --git a/out/G3M.t.sol/G3MAttackTest.json b/out/G3M.t.sol/G3MAttackTest.json
diff --git a/out/G3M.t.sol/G3MTestFork.json b/out/G3M.t.sol/G3MTestFork.json
diff --git a/out/G3M.t.sol/USDC.json b/out/G3M.t.sol/USDC.json
diff --git a/out/G3MExtendedLib.sol/G3MExtendedLib.json b/out/G3MExtendedLib.sol/G3MExtendedLib.json
diff --git a/out/G3MLib.sol/G3MLib.json b/out/G3MLib.sol/G3MLib.json
diff --git a/out/G3MLib.t.sol/G3MLibTest.json b/out/G3MLib.t.sol/G3MLibTest.json
diff --git a/out/G3MSolver.sol/G3MSolver.json b/out/G3MSolver.sol/G3MSolver.json
diff --git a/out/G3MTest.t.sol/G3MTest.json b/out/G3MTest.t.sol/G3MTest.json
diff --git a/out/Gaussian.sol/Gaussian.json b/out/Gaussian.sol/Gaussian.json
diff --git a/out/IDFMM.sol/IDFMM.json b/out/IDFMM.sol/IDFMM.json
diff --git a/out/IStrategy.sol/IStrategy.json b/out/IStrategy.sol/IStrategy.json
diff --git a/out/Init.t.sol/DFMMInit.json b/out/Init.t.sol/DFMMInit.json
diff --git a/out/Init.t.sol/G3MInitTest.json b/out/Init.t.sol/G3MInitTest.json
diff --git a/out/Init.t.sol/LogNormalInitTest.json b/out/Init.t.sol/LogNormalInitTest.json
diff --git a/out/Invariant.sol/Invariant.json b/out/Invariant.sol/Invariant.json
diff --git a/out/LPToken.sol/LPToken.json b/out/LPToken.sol/LPToken.json
diff --git a/out/LPToken.t.sol/LPTokenTest.json b/out/LPToken.t.sol/LPTokenTest.json
diff --git a/out/Lex.sol/Lex.json b/out/Lex.sol/Lex.json
diff --git a/out/LibString.sol/LibString.json b/out/LibString.sol/LibString.json
@@ -0,0 +1 @@
+{"abi":[],"bytecode":{"object":"0x60808060405234601757603a9081601d823930815050f35b600080fdfe600080fdfea2646970667358221220a77064c9ff06e79f388d7a5842200614e9cc9de4b328f881f1b70b7cd661d2af64736f6c63430008160033","sourceMap":"233:1391:19:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x600080fdfea2646970667358221220a77064c9ff06e79f388d7a5842200614e9cc9de4b328f881f1b70b7cd661d2af64736f6c63430008160033","sourceMap":"233:1391:19:-:0;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.22+commit.4fc1097e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"author\":\"Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/utils/LibString.sol)\",\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"notice\":\"Efficient library for creating string representations of integers.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"lib/solstat/lib/solmate/src/utils/LibString.sol\":\"LibString\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[\":ds-test/=lib/solstat/lib/forge-std/lib/ds-test/src/\",\":forge-std/=lib/solstat/lib/forge-std/src/\",\":solmate/=lib/solstat/lib/solmate/src/\",\":solstat/=lib/solstat/src/\"],\"viaIR\":true},\"sources\":{\"lib/solstat/lib/solmate/src/utils/LibString.sol\":{\"keccak256\":\"0x69f3e19d8a6f9e625d865feb389b7bdf78412ece18dec66229783ae613a2a6db\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://4af2d0cfae75af3d0c5ae78b14e5820e11997f9b93370d00a47faffbc8853e2d\",\"dweb:/ipfs/QmY4mdNQ5jjB7ZZpCu2LgFV8vS6pFUxiA66L1h8f9eLGdc\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.22+commit.4fc1097e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["ds-test/=lib/solstat/lib/forge-std/lib/ds-test/src/","forge-std/=lib/solstat/lib/forge-std/src/","solmate/=lib/solstat/lib/solmate/src/","solstat/=lib/solstat/src/"],"optimizer":{"enabled":true,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"lib/solstat/lib/solmate/src/utils/LibString.sol":"LibString"},"evmVersion":"paris","libraries":{},"viaIR":true},"sources":{"lib/solstat/lib/solmate/src/utils/LibString.sol":{"keccak256":"0x69f3e19d8a6f9e625d865feb389b7bdf78412ece18dec66229783ae613a2a6db","urls":["bzz-raw://4af2d0cfae75af3d0c5ae78b14e5820e11997f9b93370d00a47faffbc8853e2d","dweb:/ipfs/QmY4mdNQ5jjB7ZZpCu2LgFV8vS6pFUxiA66L1h8f9eLGdc"],"license":"MIT"}},"version":1},"ast":{"absolutePath":"lib/solstat/lib/solmate/src/utils/LibString.sol","id":26660,"exportedSymbols":{"LibString":[26659]},"nodeType":"SourceUnit","src":"32:1593:19","nodes":[{"id":26642,"nodeType":"PragmaDirective","src":"32:24:19","nodes":[],"literals":["solidity",">=","0.8",".0"]},{"id":26659,"nodeType":"ContractDefinition","src":"233:1391:19","nodes":[{"id":26658,"nodeType":"FunctionDefinition","src":"257:1365:19","nodes":[],"body":{"id":26657,"nodeType":"Block","src":"328:1294:19","nodes":[],"statements":[{"condition":{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":26652,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"id":26650,"name":"n","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":26645,"src":"342:1:19","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"30","id":26651,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"347:1:19","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"src":"342:6:19","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"id":26655,"nodeType":"IfStatement","src":"338:22:19","trueBody":{"expression":{"hexValue":"30","id":26653,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"357:3:19","typeDescriptions":{"typeIdentifier":"t_stringliteral_044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d","typeString":"literal_string \"0\""},"value":"0"},"functionReturnParameters":26649,"id":26654,"nodeType":"Return","src":"350:10:19"}},{"AST":{"nativeSrc":"428:1188:19","nodeType":"YulBlock","src":"428:1188:19","statements":[{"nativeSrc":"442:11:19","nodeType":"YulVariableDeclaration","src":"442:11:19","value":{"kind":"number","nativeSrc":"451:2:19","nodeType":"YulLiteral","src":"451:2:19","type":"","value":"78"},"variables":[{"name":"k","nativeSrc":"446:1:19","nodeType":"YulTypedName","src":"446:1:19","type":""}]},{"nativeSrc":"596:18:19","nodeType":"YulAssignment","src":"596:18:19","value":{"arguments":[{"kind":"number","nativeSrc":"609:4:19","nodeType":"YulLiteral","src":"609:4:19","type":"","value":"0x40"}],"functionName":{"name":"mload","nativeSrc":"603:5:19","nodeType":"YulIdentifier","src":"603:5:19"},"nativeSrc":"603:11:19","nodeType":"YulFunctionCall","src":"603:11:19"},"variableNames":[{"name":"str","nativeSrc":"596:3:19","nodeType":"YulIdentifier","src":"596:3:19"}]},{"expression":{"arguments":[{"name":"str","nativeSrc":"708:3:19","nodeType":"YulIdentifier","src":"708:3:19"},{"name":"k","nativeSrc":"713:1:19","nodeType":"YulIdentifier","src":"713:1:19"}],"functionName":{"name":"mstore","nativeSrc":"701:6:19","nodeType":"YulIdentifier","src":"701:6:19"},"nativeSrc":"701:14:19","nodeType":"YulFunctionCall","src":"701:14:19"},"nativeSrc":"701:14:19","nodeType":"YulExpressionStatement","src":"701:14:19"},{"expression":{"arguments":[{"kind":"number","nativeSrc":"988:4:19","nodeType":"YulLiteral","src":"988:4:19","type":"","value":"0x40"},{"arguments":[{"name":"str","nativeSrc":"998:3:19","nodeType":"YulIdentifier","src":"998:3:19"},{"kind":"number","nativeSrc":"1003:3:19","nodeType":"YulLiteral","src":"1003:3:19","type":"","value":"128"}],"functionName":{"name":"add","nativeSrc":"994:3:19","nodeType":"YulIdentifier","src":"994:3:19"},"nativeSrc":"994:13:19","nodeType":"YulFunctionCall","src":"994:13:19"}],"functionName":{"name":"mstore","nativeSrc":"981:6:19","nodeType":"YulIdentifier","src":"981:6:19"},"nativeSrc":"981:27:19","nodeType":"YulFunctionCall","src":"981:27:19"},"nativeSrc":"981:27:19","nodeType":"YulExpressionStatement","src":"981:27:19"},{"body":{"nativeSrc":"1126:284:19","nodeType":"YulBlock","src":"1126:284:19","statements":[{"nativeSrc":"1201:31:19","nodeType":"YulVariableDeclaration","src":"1201:31:19","value":{"arguments":[{"kind":"number","nativeSrc":"1217:2:19","nodeType":"YulLiteral","src":"1217:2:19","type":"","value":"48"},{"arguments":[{"name":"n","nativeSrc":"1225:1:19","nodeType":"YulIdentifier","src":"1225:1:19"},{"kind":"number","nativeSrc":"1228:2:19","nodeType":"YulLiteral","src":"1228:2:19","type":"","value":"10"}],"functionName":{"name":"mod","nativeSrc":"1221:3:19","nodeType":"YulIdentifier","src":"1221:3:19"},"nativeSrc":"1221:10:19","nodeType":"YulFunctionCall","src":"1221:10:19"}],"functionName":{"name":"add","nativeSrc":"1213:3:19","nodeType":"YulIdentifier","src":"1213:3:19"},"nativeSrc":"1213:19:19","nodeType":"YulFunctionCall","src":"1213:19:19"},"variables":[{"name":"char","nativeSrc":"1205:4:19","nodeType":"YulTypedName","src":"1205:4:19","type":""}]},{"expression":{"arguments":[{"arguments":[{"name":"str","nativeSrc":"1318:3:19","nodeType":"YulIdentifier","src":"1318:3:19"},{"name":"k","nativeSrc":"1323:1:19","nodeType":"YulIdentifier","src":"1323:1:19"}],"functionName":{"name":"add","nativeSrc":"1314:3:19","nodeType":"YulIdentifier","src":"1314:3:19"},"nativeSrc":"1314:11:19","nodeType":"YulFunctionCall","src":"1314:11:19"},{"name":"char","nativeSrc":"1327:4:19","nodeType":"YulIdentifier","src":"1327:4:19"}],"functionName":{"name":"mstore","nativeSrc":"1307:6:19","nodeType":"YulIdentifier","src":"1307:6:19"},"nativeSrc":"1307:25:19","nodeType":"YulFunctionCall","src":"1307:25:19"},"nativeSrc":"1307:25:19","nodeType":"YulExpressionStatement","src":"1307:25:19"},{"nativeSrc":"1350:14:19","nodeType":"YulAssignment","src":"1350:14:19","value":{"arguments":[{"name":"k","nativeSrc":"1359:1:19","nodeType":"YulIdentifier","src":"1359:1:19"},{"kind":"number","nativeSrc":"1362:1:19","nodeType":"YulLiteral","src":"1362:1:19","type":"","value":"1"}],"functionName":{"name":"sub","nativeSrc":"1355:3:19","nodeType":"YulIdentifier","src":"1355:3:19"},"nativeSrc":"1355:9:19","nodeType":"YulFunctionCall","src":"1355:9:19"},"variableNames":[{"name":"k","nativeSrc":"1350:1:19","nodeType":"YulIdentifier","src":"1350:1:19"}]},{"nativeSrc":"1381:15:19","nodeType":"YulAssignment","src":"1381:15:19","value":{"arguments":[{"name":"n","nativeSrc":"1390:1:19","nodeType":"YulIdentifier","src":"1390:1:19"},{"kind":"number","nativeSrc":"1393:2:19","nodeType":"YulLiteral","src":"1393:2:19","type":"","value":"10"}],"functionName":{"name":"div","nativeSrc":"1386:3:19","nodeType":"YulIdentifier","src":"1386:3:19"},"nativeSrc":"1386:10:19","nodeType":"YulFunctionCall","src":"1386:10:19"},"variableNames":[{"name":"n","nativeSrc":"1381:1:19","nodeType":"YulIdentifier","src":"1381:1:19"}]}]},"condition":{"name":"n","nativeSrc":"1121:1:19","nodeType":"YulIdentifier","src":"1121:1:19"},"nativeSrc":"1114:296:19","nodeType":"YulForLoop","post":{"nativeSrc":"1123:2:19","nodeType":"YulBlock","src":"1123:2:19","statements":[]},"pre":{"nativeSrc":"1118:2:19","nodeType":"YulBlock","src":"1118:2:19","statements":[]},"src":"1114:296:19"},{"nativeSrc":"1485:18:19","nodeType":"YulAssignment","src":"1485:18:19","value":{"arguments":[{"name":"str","nativeSrc":"1496:3:19","nodeType":"YulIdentifier","src":"1496:3:19"},{"name":"k","nativeSrc":"1501:1:19","nodeType":"YulIdentifier","src":"1501:1:19"}],"functionName":{"name":"add","nativeSrc":"1492:3:19","nodeType":"YulIdentifier","src":"1492:3:19"},"nativeSrc":"1492:11:19","nodeType":"YulFunctionCall","src":"1492:11:19"},"variableNames":[{"name":"str","nativeSrc":"1485:3:19","nodeType":"YulIdentifier","src":"1485:3:19"}]},{"expression":{"arguments":[{"name":"str","nativeSrc":"1590:3:19","nodeType":"YulIdentifier","src":"1590:3:19"},{"arguments":[{"kind":"number","nativeSrc":"1599:2:19","nodeType":"YulLiteral","src":"1599:2:19","type":"","value":"78"},{"name":"k","nativeSrc":"1603:1:19","nodeType":"YulIdentifier","src":"1603:1:19"}],"functionName":{"name":"sub","nativeSrc":"1595:3:19","nodeType":"YulIdentifier","src":"1595:3:19"},"nativeSrc":"1595:10:19","nodeType":"YulFunctionCall","src":"1595:10:19"}],"functionName":{"name":"mstore","nativeSrc":"1583:6:19","nodeType":"YulIdentifier","src":"1583:6:19"},"nativeSrc":"1583:23:19","nodeType":"YulFunctionCall","src":"1583:23:19"},"nativeSrc":"1583:23:19","nodeType":"YulExpressionStatement","src":"1583:23:19"}]},"evmVersion":"paris","externalReferences":[{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1121:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1225:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1381:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1390:1:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1318:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1485:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1496:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1590:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"596:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"708:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"998:3:19","valueSize":1}],"id":26656,"nodeType":"InlineAssembly","src":"419:1197:19"}]},"implemented":true,"kind":"function","modifiers":[],"name":"toString","nameLocation":"266:8:19","parameters":{"id":26646,"nodeType":"ParameterList","parameters":[{"constant":false,"id":26645,"mutability":"mutable","name":"n","nameLocation":"283:1:19","nodeType":"VariableDeclaration","scope":26658,"src":"275:9:19","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":26644,"name":"uint256","nodeType":"ElementaryTypeName","src":"275:7:19","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"274:11:19"},"returnParameters":{"id":26649,"nodeType":"ParameterList","parameters":[{"constant":false,"id":26648,"mutability":"mutable","name":"str","nameLocation":"323:3:19","nodeType":"VariableDeclaration","scope":26658,"src":"309:17:19","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":26647,"name":"string","nodeType":"ElementaryTypeName","src":"309:6:19","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"308:19:19"},"scope":26659,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"LibString","contractDependencies":[],"contractKind":"library","documentation":{"id":26643,"nodeType":"StructuredDocumentation","src":"58:175:19","text":"@notice Efficient library for creating string representations of integers.\n @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/utils/LibString.sol)"},"fullyImplemented":true,"linearizedBaseContracts":[26659],"name":"LibString","nameLocation":"241:9:19","scope":26660,"usedErrors":[],"usedEvents":[]}],"license":"MIT"},"id":19}
diff --git a/out/LogNormal.sol/LogNormal.json b/out/LogNormal.sol/LogNormal.json
diff --git a/out/LogNormal.t.sol/LogNormalTestFork.json b/out/LogNormal.t.sol/LogNormalTestFork.json
diff --git a/out/LogNormalExtendedLib.sol/LogNormalExtendedLib.json b/out/LogNormalExtendedLib.sol/LogNormalExtendedLib.json
diff --git a/out/LogNormalLib.sol/LogNormalLib.json b/out/LogNormalLib.sol/LogNormalLib.json
diff --git a/out/LogNormalMath.sol/LogNormalMath.json b/out/LogNormalMath.sol/LogNormalMath.json
diff --git a/out/LogNormalSolver.sol/LogNormalSolver.json b/out/LogNormalSolver.sol/LogNormalSolver.json
diff --git a/out/LogNormalTest.t.sol/LogNormalTest.json b/out/LogNormalTest.t.sol/LogNormalTest.json
diff --git a/out/MockERC20.sol/MockERC20.json b/out/MockERC20.sol/MockERC20.json
diff --git a/out/MockStrategy.sol/MockStrategy.json b/out/MockStrategy.sol/MockStrategy.json
diff --git a/out/PortfolioTracker.sol/PortfolioTracker.json b/out/PortfolioTracker.sol/PortfolioTracker.json
diff --git a/out/PortfolioTracker.sol/TokenLike.json b/out/PortfolioTracker.sol/TokenLike.json
diff --git a/out/SafeTransferLib.sol/SafeTransferLib.json b/out/SafeTransferLib.sol/SafeTransferLib.json
diff --git a/out/ScalingLib.sol/ScalingLib.json b/out/ScalingLib.sol/ScalingLib.json
diff --git a/out/ScalingLib.t.sol/ScalingLibTest.json b/out/ScalingLib.t.sol/ScalingLibTest.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"abi":[],"bytecode":{"object":"0x60808060405234601757603a9081601d823930815050f35b600080fdfe600080fdfea2646970667358221220a77064c9ff06e79f388d7a5842200614e9cc9de4b328f881f1b70b7cd661d2af64736f6c63430008160033","sourceMap":"233:1391:19:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x600080fdfea2646970667358221220a77064c9ff06e79f388d7a5842200614e9cc9de4b328f881f1b70b7cd661d2af64736f6c63430008160033","sourceMap":"233:1391:19:-:0;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.22+commit.4fc1097e\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"author\":\"Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/utils/LibString.sol)\",\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"notice\":\"Efficient library for creating string representations of integers.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"lib/solstat/lib/solmate/src/utils/LibString.sol\":\"LibString\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[\":ds-test/=lib/solstat/lib/forge-std/lib/ds-test/src/\",\":forge-std/=lib/solstat/lib/forge-std/src/\",\":solmate/=lib/solstat/lib/solmate/src/\",\":solstat/=lib/solstat/src/\"],\"viaIR\":true},\"sources\":{\"lib/solstat/lib/solmate/src/utils/LibString.sol\":{\"keccak256\":\"0x69f3e19d8a6f9e625d865feb389b7bdf78412ece18dec66229783ae613a2a6db\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://4af2d0cfae75af3d0c5ae78b14e5820e11997f9b93370d00a47faffbc8853e2d\",\"dweb:/ipfs/QmY4mdNQ5jjB7ZZpCu2LgFV8vS6pFUxiA66L1h8f9eLGdc\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.22+commit.4fc1097e"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["ds-test/=lib/solstat/lib/forge-std/lib/ds-test/src/","forge-std/=lib/solstat/lib/forge-std/src/","solmate/=lib/solstat/lib/solmate/src/","solstat/=lib/solstat/src/"],"optimizer":{"enabled":true,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"lib/solstat/lib/solmate/src/utils/LibString.sol":"LibString"},"evmVersion":"paris","libraries":{},"viaIR":true},"sources":{"lib/solstat/lib/solmate/src/utils/LibString.sol":{"keccak256":"0x69f3e19d8a6f9e625d865feb389b7bdf78412ece18dec66229783ae613a2a6db","urls":["bzz-raw://4af2d0cfae75af3d0c5ae78b14e5820e11997f9b93370d00a47faffbc8853e2d","dweb:/ipfs/QmY4mdNQ5jjB7ZZpCu2LgFV8vS6pFUxiA66L1h8f9eLGdc"],"license":"MIT"}},"version":1},"ast":{"absolutePath":"lib/solstat/lib/solmate/src/utils/LibString.sol","id":26660,"exportedSymbols":{"LibString":[26659]},"nodeType":"SourceUnit","src":"32:1593:19","nodes":[{"id":26642,"nodeType":"PragmaDirective","src":"32:24:19","nodes":[],"literals":["solidity",">=","0.8",".0"]},{"id":26659,"nodeType":"ContractDefinition","src":"233:1391:19","nodes":[{"id":26658,"nodeType":"FunctionDefinition","src":"257:1365:19","nodes":[],"body":{"id":26657,"nodeType":"Block","src":"328:1294:19","nodes":[],"statements":[{"condition":{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":26652,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"id":26650,"name":"n","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":26645,"src":"342:1:19","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"30","id":26651,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"347:1:19","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"src":"342:6:19","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"id":26655,"nodeType":"IfStatement","src":"338:22:19","trueBody":{"expression":{"hexValue":"30","id":26653,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"357:3:19","typeDescriptions":{"typeIdentifier":"t_stringliteral_044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d","typeString":"literal_string \"0\""},"value":"0"},"functionReturnParameters":26649,"id":26654,"nodeType":"Return","src":"350:10:19"}},{"AST":{"nativeSrc":"428:1188:19","nodeType":"YulBlock","src":"428:1188:19","statements":[{"nativeSrc":"442:11:19","nodeType":"YulVariableDeclaration","src":"442:11:19","value":{"kind":"number","nativeSrc":"451:2:19","nodeType":"YulLiteral","src":"451:2:19","type":"","value":"78"},"variables":[{"name":"k","nativeSrc":"446:1:19","nodeType":"YulTypedName","src":"446:1:19","type":""}]},{"nativeSrc":"596:18:19","nodeType":"YulAssignment","src":"596:18:19","value":{"arguments":[{"kind":"number","nativeSrc":"609:4:19","nodeType":"YulLiteral","src":"609:4:19","type":"","value":"0x40"}],"functionName":{"name":"mload","nativeSrc":"603:5:19","nodeType":"YulIdentifier","src":"603:5:19"},"nativeSrc":"603:11:19","nodeType":"YulFunctionCall","src":"603:11:19"},"variableNames":[{"name":"str","nativeSrc":"596:3:19","nodeType":"YulIdentifier","src":"596:3:19"}]},{"expression":{"arguments":[{"name":"str","nativeSrc":"708:3:19","nodeType":"YulIdentifier","src":"708:3:19"},{"name":"k","nativeSrc":"713:1:19","nodeType":"YulIdentifier","src":"713:1:19"}],"functionName":{"name":"mstore","nativeSrc":"701:6:19","nodeType":"YulIdentifier","src":"701:6:19"},"nativeSrc":"701:14:19","nodeType":"YulFunctionCall","src":"701:14:19"},"nativeSrc":"701:14:19","nodeType":"YulExpressionStatement","src":"701:14:19"},{"expression":{"arguments":[{"kind":"number","nativeSrc":"988:4:19","nodeType":"YulLiteral","src":"988:4:19","type":"","value":"0x40"},{"arguments":[{"name":"str","nativeSrc":"998:3:19","nodeType":"YulIdentifier","src":"998:3:19"},{"kind":"number","nativeSrc":"1003:3:19","nodeType":"YulLiteral","src":"1003:3:19","type":"","value":"128"}],"functionName":{"name":"add","nativeSrc":"994:3:19","nodeType":"YulIdentifier","src":"994:3:19"},"nativeSrc":"994:13:19","nodeType":"YulFunctionCall","src":"994:13:19"}],"functionName":{"name":"mstore","nativeSrc":"981:6:19","nodeType":"YulIdentifier","src":"981:6:19"},"nativeSrc":"981:27:19","nodeType":"YulFunctionCall","src":"981:27:19"},"nativeSrc":"981:27:19","nodeType":"YulExpressionStatement","src":"981:27:19"},{"body":{"nativeSrc":"1126:284:19","nodeType":"YulBlock","src":"1126:284:19","statements":[{"nativeSrc":"1201:31:19","nodeType":"YulVariableDeclaration","src":"1201:31:19","value":{"arguments":[{"kind":"number","nativeSrc":"1217:2:19","nodeType":"YulLiteral","src":"1217:2:19","type":"","value":"48"},{"arguments":[{"name":"n","nativeSrc":"1225:1:19","nodeType":"YulIdentifier","src":"1225:1:19"},{"kind":"number","nativeSrc":"1228:2:19","nodeType":"YulLiteral","src":"1228:2:19","type":"","value":"10"}],"functionName":{"name":"mod","nativeSrc":"1221:3:19","nodeType":"YulIdentifier","src":"1221:3:19"},"nativeSrc":"1221:10:19","nodeType":"YulFunctionCall","src":"1221:10:19"}],"functionName":{"name":"add","nativeSrc":"1213:3:19","nodeType":"YulIdentifier","src":"1213:3:19"},"nativeSrc":"1213:19:19","nodeType":"YulFunctionCall","src":"1213:19:19"},"variables":[{"name":"char","nativeSrc":"1205:4:19","nodeType":"YulTypedName","src":"1205:4:19","type":""}]},{"expression":{"arguments":[{"arguments":[{"name":"str","nativeSrc":"1318:3:19","nodeType":"YulIdentifier","src":"1318:3:19"},{"name":"k","nativeSrc":"1323:1:19","nodeType":"YulIdentifier","src":"1323:1:19"}],"functionName":{"name":"add","nativeSrc":"1314:3:19","nodeType":"YulIdentifier","src":"1314:3:19"},"nativeSrc":"1314:11:19","nodeType":"YulFunctionCall","src":"1314:11:19"},{"name":"char","nativeSrc":"1327:4:19","nodeType":"YulIdentifier","src":"1327:4:19"}],"functionName":{"name":"mstore","nativeSrc":"1307:6:19","nodeType":"YulIdentifier","src":"1307:6:19"},"nativeSrc":"1307:25:19","nodeType":"YulFunctionCall","src":"1307:25:19"},"nativeSrc":"1307:25:19","nodeType":"YulExpressionStatement","src":"1307:25:19"},{"nativeSrc":"1350:14:19","nodeType":"YulAssignment","src":"1350:14:19","value":{"arguments":[{"name":"k","nativeSrc":"1359:1:19","nodeType":"YulIdentifier","src":"1359:1:19"},{"kind":"number","nativeSrc":"1362:1:19","nodeType":"YulLiteral","src":"1362:1:19","type":"","value":"1"}],"functionName":{"name":"sub","nativeSrc":"1355:3:19","nodeType":"YulIdentifier","src":"1355:3:19"},"nativeSrc":"1355:9:19","nodeType":"YulFunctionCall","src":"1355:9:19"},"variableNames":[{"name":"k","nativeSrc":"1350:1:19","nodeType":"YulIdentifier","src":"1350:1:19"}]},{"nativeSrc":"1381:15:19","nodeType":"YulAssignment","src":"1381:15:19","value":{"arguments":[{"name":"n","nativeSrc":"1390:1:19","nodeType":"YulIdentifier","src":"1390:1:19"},{"kind":"number","nativeSrc":"1393:2:19","nodeType":"YulLiteral","src":"1393:2:19","type":"","value":"10"}],"functionName":{"name":"div","nativeSrc":"1386:3:19","nodeType":"YulIdentifier","src":"1386:3:19"},"nativeSrc":"1386:10:19","nodeType":"YulFunctionCall","src":"1386:10:19"},"variableNames":[{"name":"n","nativeSrc":"1381:1:19","nodeType":"YulIdentifier","src":"1381:1:19"}]}]},"condition":{"name":"n","nativeSrc":"1121:1:19","nodeType":"YulIdentifier","src":"1121:1:19"},"nativeSrc":"1114:296:19","nodeType":"YulForLoop","post":{"nativeSrc":"1123:2:19","nodeType":"YulBlock","src":"1123:2:19","statements":[]},"pre":{"nativeSrc":"1118:2:19","nodeType":"YulBlock","src":"1118:2:19","statements":[]},"src":"1114:296:19"},{"nativeSrc":"1485:18:19","nodeType":"YulAssignment","src":"1485:18:19","value":{"arguments":[{"name":"str","nativeSrc":"1496:3:19","nodeType":"YulIdentifier","src":"1496:3:19"},{"name":"k","nativeSrc":"1501:1:19","nodeType":"YulIdentifier","src":"1501:1:19"}],"functionName":{"name":"add","nativeSrc":"1492:3:19","nodeType":"YulIdentifier","src":"1492:3:19"},"nativeSrc":"1492:11:19","nodeType":"YulFunctionCall","src":"1492:11:19"},"variableNames":[{"name":"str","nativeSrc":"1485:3:19","nodeType":"YulIdentifier","src":"1485:3:19"}]},{"expression":{"arguments":[{"name":"str","nativeSrc":"1590:3:19","nodeType":"YulIdentifier","src":"1590:3:19"},{"arguments":[{"kind":"number","nativeSrc":"1599:2:19","nodeType":"YulLiteral","src":"1599:2:19","type":"","value":"78"},{"name":"k","nativeSrc":"1603:1:19","nodeType":"YulIdentifier","src":"1603:1:19"}],"functionName":{"name":"sub","nativeSrc":"1595:3:19","nodeType":"YulIdentifier","src":"1595:3:19"},"nativeSrc":"1595:10:19","nodeType":"YulFunctionCall","src":"1595:10:19"}],"functionName":{"name":"mstore","nativeSrc":"1583:6:19","nodeType":"YulIdentifier","src":"1583:6:19"},"nativeSrc":"1583:23:19","nodeType":"YulFunctionCall","src":"1583:23:19"},"nativeSrc":"1583:23:19","nodeType":"YulExpressionStatement","src":"1583:23:19"}]},"evmVersion":"paris","externalReferences":[{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1121:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1225:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1381:1:19","valueSize":1},{"declaration":26645,"isOffset":false,"isSlot":false,"src":"1390:1:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1318:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1485:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1496:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"1590:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"596:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"708:3:19","valueSize":1},{"declaration":26648,"isOffset":false,"isSlot":false,"src":"998:3:19","valueSize":1}],"id":26656,"nodeType":"InlineAssembly","src":"419:1197:19"}]},"implemented":true,"kind":"function","modifiers":[],"name":"toString","nameLocation":"266:8:19","parameters":{"id":26646,"nodeType":"ParameterList","parameters":[{"constant":false,"id":26645,"mutability":"mutable","name":"n","nameLocation":"283:1:19","nodeType":"VariableDeclaration","scope":26658,"src":"275:9:19","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":26644,"name":"uint256","nodeType":"ElementaryTypeName","src":"275:7:19","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"274:11:19"},"returnParameters":{"id":26649,"nodeType":"ParameterList","parameters":[{"constant":false,"id":26648,"mutability":"mutable","name":"str","nameLocation":"323:3:19","nodeType":"VariableDeclaration","scope":26658,"src":"309:17:19","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":26647,"name":"string","nodeType":"ElementaryTypeName","src":"309:6:19","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"308:19:19"},"scope":26659,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"LibString","contractDependencies":[],"contractKind":"library","documentation":{"id":26643,"nodeType":"StructuredDocumentation","src":"58:175:19","text":"@notice Efficient library for creating string representations of integers.\n @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/utils/LibString.sol)"},"fullyImplemented":true,"linearizedBaseContracts":[26659],"name":"LibString","nameLocation":"241:9:19","scope":26660,"usedErrors":[],"usedEvents":[]}],"license":"MIT"},"id":19}