Skip to content

Commit

Permalink
Merge branch 'main' into posm-modifyLiquiditiesWithoutUnlock-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
saucepoint committed Aug 14, 2024
2 parents 39b80b0 + f2f68ec commit 7f85a4a
Show file tree
Hide file tree
Showing 87 changed files with 1,245 additions and 249 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133557
133206
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135593
135242
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128067
127716
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128205
127854
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
47170
47167
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
46988
46984
Original file line number Diff line number Diff line change
@@ -1 +1 @@
123220
123586
Original file line number Diff line number Diff line change
@@ -1 +1 @@
122727
123093
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130298
130664
Original file line number Diff line number Diff line change
@@ -1 +1 @@
129805
130172
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
141690
142147
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
150538
150995
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
150538
150995
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withTakePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
149910
150367
Original file line number Diff line number Diff line change
@@ -1 +1 @@
108827
109192
Original file line number Diff line number Diff line change
@@ -1 +1 @@
116081
116538
Original file line number Diff line number Diff line change
@@ -1 +1 @@
115453
115910
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
134377
134740
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127116
127479
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128797
129254
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_take_take.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
116614
117071
Original file line number Diff line number Diff line change
@@ -1 +1 @@
152488
155245
Original file line number Diff line number Diff line change
@@ -1 +1 @@
151490
154247
Original file line number Diff line number Diff line change
@@ -1 +1 @@
134288
137045
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130387
133390
Original file line number Diff line number Diff line change
@@ -1 +1 @@
171303
174306
Original file line number Diff line number Diff line change
@@ -1 +1 @@
141259
144262
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
340631
341067
Original file line number Diff line number Diff line change
@@ -1 +1 @@
349123
349559
Original file line number Diff line number Diff line change
@@ -1 +1 @@
348425
348861
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickLower.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318613
319049
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickUpper.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
319255
319691
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
244837
245273
Original file line number Diff line number Diff line change
@@ -1 +1 @@
374655
375091
Original file line number Diff line number Diff line change
@@ -1 +1 @@
324631
325067
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
375931
376367
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withSettlePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
375071
375507
Original file line number Diff line number Diff line change
@@ -1 +1 @@
420405
420841
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_Bytecode.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8454
8389
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119572
119501
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
118767
118696
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127639
127568
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
134469
134398
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
186010
185939
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
177945
177874
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
237532
237461
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
229491
229420
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133557
133206
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
118660
118309
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
117838
117482
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cache/
foundry-out/
.vscode/
.vscode/
broadcast/*/*/dry-run/*.json
broadcast/*/*/run-[0-9]*.json
69 changes: 69 additions & 0 deletions broadcast/01_PoolManager.s.sol/11155111/run-latest.json

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions broadcast/01_PoolManager.s.sol/84532/run-latest.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"transactions": [
{
"hash": "0x0e36efb3560fe4f336ed0a49c320c1d094ef0b371a690efd6556c93cc8f86fd9",
"transactionType": "CREATE",
"contractName": "PoolModifyLiquidityTest",
"contractAddress": "0x39bf2eff94201cfaa471932655404f63315147a4",
"function": null,
"arguments": [
"0xc021A7Deb4a939fd7E661a0669faB5ac7Ba2D5d6"
],
"transaction": {
"from": "0x7024cc7e60d6560f0b5877da2bb921fcbf1f4375",
"gas": "0x1c11c6",
"value": "0x0",
"input": "0x60a034608257601f61194f38819003918201601f19168301916001600160401b03831184841017608657808492602094604052833981010312608257516001600160a01b03811681036082576080526040516118b4908161009b82396080518181816104c2015281816106070152818161093a01528181610c2f015261120e0152f35b5f80fd5b634e487b7160e01b5f52604160045260245ffdfe60806040526004361015610011575f80fd5b5f3560e01c80630a5b11e414610054578063481c6a751461004f5780635a6bcfda1461004a576391dd734614610045575f80fd5b6106eb565b6104e6565b610478565b6101807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e35761008836610221565b61009136610323565b90610124359067ffffffffffffffff82116100e3576020926100ba6100db933690600401610413565b61014435916100c883610459565b61016435936100d685610459565b6108df565b604051908152f35b5f80fd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b60a0810190811067ffffffffffffffff82111761013057604052565b6100e7565b6080810190811067ffffffffffffffff82111761013057604052565b60c0810190811067ffffffffffffffff82111761013057604052565b6060810190811067ffffffffffffffff82111761013057604052565b90601f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0910116810190811067ffffffffffffffff82111761013057604052565b604051906101d960c083610189565b565b604051906101d9606083610189565b73ffffffffffffffffffffffffffffffffffffffff8116036100e357565b35906101d9826101ea565b35908160020b82036100e357565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc60a09101126100e3576040519061025882610114565b81600435610265816101ea565b8152602435610273816101ea565b602082015260443562ffffff811681036100e35760408201526064358060020b81036100e35760608201526080608435916102ad836101ea565b0152565b91908260a09103126100e3576040516102c981610114565b809280356102d6816101ea565b825260208101356102e6816101ea565b6020830152604081013562ffffff811681036100e3576080918291604085015261031260608201610213565b60608501520135916102ad836101ea565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5c60809101126100e3576040519061035a82610135565b8160a4358060020b81036100e357815260c4358060020b81036100e357602082015260e4356040820152606061010435910152565b91908260809103126100e3576040516103a781610135565b60608082946103b581610213565b84526103c360208201610213565b6020850152604081013560408501520135910152565b67ffffffffffffffff811161013057601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b81601f820112156100e35780359061042a826103d9565b926104386040519485610189565b828452602083830101116100e357815f926020809301838601378301015290565b801515036100e357565b35906101d982610459565b5f9103126100e357565b346100e3575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e357602060405173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b6101407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e35761051a36610221565b61052336610323565b90610124359167ffffffffffffffff83116100e3576105ba5f9261058e926105526105ed963690600401610413565b9061055b6101ca565b33815292602084015260408301526060820152831515608082015283151560a08201525b60405192839160208301610778565b037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08101835282610189565b604051809381927f48c89491000000000000000000000000000000000000000000000000000000008352600483016106d7565b03818373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000165af190811561068f5760209161064d915f9161066d575b508280825183010191016108d0565b478061065d575b50604051908152f35b610667903361107b565b5f610654565b61068991503d805f833e6106818183610189565b810190610862565b5f61063e565b6108c5565b907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f602080948051918291828752018686015e5f8582860101520116010190565b9060206106e8928181520190610694565b90565b346100e35760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e35760043567ffffffffffffffff81116100e357366023820112156100e35780600401359067ffffffffffffffff82116100e35736602483830101116100e3576107749160246107689201610c26565b604051918291826106d7565b0390f35b6020815273ffffffffffffffffffffffffffffffffffffffff82511660208201526107f56020830151604083019073ffffffffffffffffffffffffffffffffffffffff6080809282815116855282602082015116602086015262ffffff6040820151166040860152606081015160020b6060860152015116910152565b61082b604083015160e083019060608091805160020b8452602081015160020b6020850152604081015160408501520151910152565b6101a060a061084a6060850151836101608601526101c0850190610694565b93608081015115156101808501520151151591015290565b6020818303126100e35780519067ffffffffffffffff82116100e3570181601f820112156100e357805190610896826103d9565b926108a46040519485610189565b828452602083830101116100e357815f9260208093018386015e8301015290565b6040513d5f823e3d90fd5b908160209103126100e3575190565b61057f610920956109175f9661058e966105ba966108fb6101ca565b3381529660208801526040870152606086015215156080850152565b151560a0830152565b03818373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000165af1801561068f5761097d915f91610991575b50602080825183010191016108d0565b9047806109875750565b6101d9903361107b565b6109a591503d805f833e6106818183610189565b5f61096d565b156100e357565b6020818303126100e35780359067ffffffffffffffff82116100e357016101a0818303126100e357604051916109e783610151565b6109f082610208565b83526109ff81602084016102b1565b6020840152610a118160c0840161038f565b60408401526101408201359167ffffffffffffffff83116100e357610a3e61018092610a5b948301610413565b6060850152610a506101608201610463565b608085015201610463565b60a082015290565b91908260409103126100e3576020825192015190565b610b066106e89493610ad8836101409573ffffffffffffffffffffffffffffffffffffffff6080809282815116855282602082015116602086015262ffffff6040820151166040860152606081015160020b6060860152015116910152565b8051600290810b60a08501526020820151900b60c0840152604081015160e084015260600151610100830152565b816101208201520190610694565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b9190915f8382019384129112908015821691151617610b5c57565b610b14565b15610b6857565b60646040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f6c6971756964697479206368616e676520696e636f72726563740000000000006044820152fd5b15610bcd57565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52600160045260245ffd5b7f80000000000000000000000000000000000000000000000000000000000000008114610b5c575f0390565b610d1a90610c7a7f00000000000000000000000000000000000000000000000000000000000000009173ffffffffffffffffffffffffffffffffffffffff831694610c728633146109ab565b8101906109b2565b906020820190610c8c825160a0902090565b946040610cd8610cc2828701988951610ca6815160020b90565b6060610cb6602084015160020b90565b92015192309089611097565b516fffffffffffffffffffffffffffffffff1690565b9184519088515f60608901519385519a8b95869485937f5a6bcfda00000000000000000000000000000000000000000000000000000000855260048501610a79565b03925af193841561068f5761058e966106e8965f96611049575b506040610d6c610cc2610d49885160a0902090565b8451805160020b6060610d60602084015160020b90565b9201519230908b611097565b91610e36610db9610d93895173ffffffffffffffffffffffffffffffffffffffff90511690565b3090610db3885173ffffffffffffffffffffffffffffffffffffffff1690565b906111ea565b959150506fffffffffffffffffffffffffffffffff610e2b610e17610df760208d510173ffffffffffffffffffffffffffffffffffffffff90511690565b3090610db38b5173ffffffffffffffffffffffffffffffffffffffff1690565b9a9150508287875101519116600f0b610b41565b9116600f0b14610b61565b5101515f81121561100457505f81138015610ffb575b610e5590610bc6565b5f81128015610ff2575b610e699015610bc6565b5f8112610faf575b5f8312610f54575b5f8113610f03575b505f8213610ea2575b50505050604051928391602083019190602083019252565b610ec86020610efa95510173ffffffffffffffffffffffffffffffffffffffff90511690565b92610ef460a0610eec845173ffffffffffffffffffffffffffffffffffffffff1690565b930151151590565b936116b7565b5f808080610e8a565b845151610f4e919073ffffffffffffffffffffffffffffffffffffffff1690610f40845173ffffffffffffffffffffffffffffffffffffffff1690565b86610ef460a0870151151590565b5f610e81565b845160200151610faa9073ffffffffffffffffffffffffffffffffffffffff16835173ffffffffffffffffffffffffffffffffffffffff16610f9586610bfa565b9087610fa46080880151151590565b936112cd565b610e79565b845151610fed9073ffffffffffffffffffffffffffffffffffffffff16835173ffffffffffffffffffffffffffffffffffffffff16610f9584610bfa565b610e71565b505f8312610e5f565b505f8313610e4c565b5f1215610e69575f81128015611040575b61101e90610bc6565b5f81138015611037575b6110329015610bc6565b610e69565b505f8313611028565b505f8312611015565b61106c91965060403d604011611074575b6110648183610189565b810190610a63565b50945f610d34565b503d61105a565b5f80809381935af11561108a57565b63f4b3b1bc5f526004601cfd5b949390939291925f604080516110ac8161016d565b82815282602082015201526026526006526003525f52603a600c20905f6026526040516020810191825260066040820152604081526110ec606082610189565b51902060068101809111610b5c5760408051602081019384529081019190915273ffffffffffffffffffffffffffffffffffffffff925f9261117b92611135816060810161058e565b5190206040519485809481937f35fd631a000000000000000000000000000000000000000000000000000000008352600483016020600391939293604081019481520152565b0392165afa90811561068f575f916111d0575b5060208101519060606040820151910151906111c36111ab6101db565b6fffffffffffffffffffffffffffffffff9094168452565b6020830152604082015290565b6111e491503d805f833e6106818183610189565b5f61118e565b92906111f690846117e4565b9273ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000169061123982826117e4565b935f52602052602060405f206024604051809481937ff135baaa00000000000000000000000000000000000000000000000000000000835260048301525afa90811561068f575f91611289575090565b90506020813d6020116112b0575b816112a460209383610189565b810103126100e3575190565b3d9150611297565b908160209103126100e357516106e881610459565b93919291156113b35761131061131073ffffffffffffffffffffffffffffffffffffffff61132993169573ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1690565b92803b156100e3576040517ff5298aca00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909316600484015260248301939093526044820152905f908290818381606481015b03925af1801561068f5761139f5750565b806113ad5f6101d993610189565b8061046e565b9173ffffffffffffffffffffffffffffffffffffffff841661145957506040517f6a256b2900000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff93841660048201529260209284926024928492165af1801561068f5761142e5750565b61144f9060203d602011611452575b6114478183610189565b8101906108d0565b50565b503d61143d565b6040517fa584119400000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff85811660048301529293909216916020816024815f875af1801561068f5761169a575b5073ffffffffffffffffffffffffffffffffffffffff811630146115f3576040517f23b872dd00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff918216600482015290821660248201526044810192909252602082806064810103815f73ffffffffffffffffffffffffffffffffffffffff88165af190811561068f575f936020936115b5936115c6575b505b6040519485809481937f6a256b290000000000000000000000000000000000000000000000000000000083526004830191909173ffffffffffffffffffffffffffffffffffffffff6020820193169052565b03925af1801561068f5761142e5750565b6115e590853d87116115ec575b6115dd8183610189565b8101906112b8565b505f611561565b503d6115d3565b506040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff821660048201526024810192909252602082806044810103815f73ffffffffffffffffffffffffffffffffffffffff88165af190811561068f575f936020936115b59361167d575b50611563565b61169390853d87116115ec576115dd8183610189565b505f611677565b6116b29060203d602011611452576114478183610189565b6114b7565b93919291156117635761131061131073ffffffffffffffffffffffffffffffffffffffff6116fa93169573ffffffffffffffffffffffffffffffffffffffff1690565b92803b156100e3576040517f156e29f600000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909316600484015260248301939093526044820152905f9082908183816064810161138e565b91929173ffffffffffffffffffffffffffffffffffffffff16803b156100e3576040517f0b0d9c0900000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff938416600482015293909216602484015260448301525f9082908183816064810161138e565b73ffffffffffffffffffffffffffffffffffffffff811661180457503190565b9073ffffffffffffffffffffffffffffffffffffffff60246020928260405195869485937f70a08231000000000000000000000000000000000000000000000000000000008552166004840152165afa90811561068f575f91611865575090565b6106e8915060203d60201161145257611447818361018956fea2646970667358221220f765e66a67f7100c995a43007098f6f6e1f2758bba46beb22c8e7f6dc282d06b64736f6c634300081a0033000000000000000000000000c021a7deb4a939fd7e661a0669fab5ac7ba2d5d6",
"nonce": "0x1f",
"chainId": "0xaa36a7"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0xc005d1",
"logs": [],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0x0e36efb3560fe4f336ed0a49c320c1d094ef0b371a690efd6556c93cc8f86fd9",
"transactionIndex": "0x5c",
"blockHash": "0x2dd72ae243790b5e7bc4c6ae30d65e8cecbb7b1b6ec57cb87937cf647eac76c7",
"blockNumber": "0x5bc1f6",
"gasUsed": "0x159785",
"effectiveGasPrice": "0x33d9b23fd",
"from": "0x7024cc7e60d6560f0b5877da2bb921fcbf1f4375",
"to": null,
"contractAddress": "0x39bf2eff94201cfaa471932655404f63315147a4"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1717170897,
"chain": 11155111,
"commit": "1bb670c8"
}
Loading

0 comments on commit 7f85a4a

Please sign in to comment.