Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add offchain clPosition descriptor #33

Merged
merged 3 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1 +1 @@
743154
743226
Original file line number Diff line number Diff line change
@@ -1 +1 @@
628697
628769
Original file line number Diff line number Diff line change
@@ -1 +1 @@
700310
700382
Original file line number Diff line number Diff line change
@@ -1 +1 @@
793013
793085
Original file line number Diff line number Diff line change
@@ -1 +1 @@
681111
681183
Original file line number Diff line number Diff line change
@@ -1 +1 @@
750212
750284
Original file line number Diff line number Diff line change
@@ -1 +1 @@
743166
743238
Original file line number Diff line number Diff line change
@@ -1 +1 @@
628709
628781
Original file line number Diff line number Diff line change
@@ -1 +1 @@
700310
700382
Original file line number Diff line number Diff line change
@@ -1 +1 @@
790995
791067
Original file line number Diff line number Diff line change
@@ -1 +1 @@
679093
679165
Original file line number Diff line number Diff line change
@@ -1 +1 @@
748194
748266
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_burn_empty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60159
60231
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_burn_empty_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60159
60231
Original file line number Diff line number Diff line change
@@ -1 +1 @@
173520
173592
Original file line number Diff line number Diff line change
@@ -1 +1 @@
172835
172907
Original file line number Diff line number Diff line change
@@ -1 +1 @@
182099
182171
Original file line number Diff line number Diff line change
@@ -1 +1 @@
181414
181486
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_collect_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
205047
205119
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_collect_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
213626
213698
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_collect_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
213626
213698
Original file line number Diff line number Diff line change
@@ -1 +1 @@
212953
213025
Original file line number Diff line number Diff line change
@@ -1 +1 @@
170330
170402
Original file line number Diff line number Diff line change
@@ -1 +1 @@
178909
178981
Original file line number Diff line number Diff line change
@@ -1 +1 @@
178236
178308
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_decrease_burnEmpty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
185782
185854
Original file line number Diff line number Diff line change
@@ -1 +1 @@
177203
177275
Original file line number Diff line number Diff line change
@@ -1 +1 @@
191534
191606
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_decrease_take_take.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
179502
179574
Original file line number Diff line number Diff line change
@@ -1 +1 @@
220439
220511
Original file line number Diff line number Diff line change
@@ -1 +1 @@
219406
219478
Original file line number Diff line number Diff line change
@@ -1 +1 @@
202317
202389
Original file line number Diff line number Diff line change
@@ -1 +1 @@
165325
165397
Original file line number Diff line number Diff line change
@@ -1 +1 @@
238620
238692
Original file line number Diff line number Diff line change
@@ -1 +1 @@
209378
209450
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_mint_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
538507
538579
Original file line number Diff line number Diff line change
@@ -1 +1 @@
547036
547108
Original file line number Diff line number Diff line change
@@ -1 +1 @@
546287
546359
Original file line number Diff line number Diff line change
@@ -1 +1 @@
393425
393497
Original file line number Diff line number Diff line change
@@ -1 +1 @@
393862
393934
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_mint_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
302650
302722
Original file line number Diff line number Diff line change
@@ -1 +1 @@
592719
592791
Original file line number Diff line number Diff line change
@@ -1 +1 @@
399137
399209
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_mint_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
593869
593941
Original file line number Diff line number Diff line change
@@ -1 +1 @@
592978
593050
Original file line number Diff line number Diff line change
@@ -1 +1 @@
652835
652929
2 changes: 1 addition & 1 deletion .forge-snapshots/CLPositionManager_unsubscribe.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
59181
59203
25 changes: 25 additions & 0 deletions script/01_DeployCLPositionDescriptorOffchain.s.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.24;

import "forge-std/Script.sol";
import {BaseScript} from "./BaseScript.sol";
import {CLPositionDescriptorOffChain} from "../src/pool-cl/CLPositionDescriptorOffChain.sol";

/**
* forge script --sig 'run(string)' script/01_DeployCLPositionDescriptorOffchain.s.sol:DeployCLPositionDescriptorOffChainScript <baseTokenURI> -vvv \
* --rpc-url $RPC_URL \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be --sig 'run(string)' ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

script/01_DeployCLPositionDescriptor.s.sol -> script/01_DeployCLPositionDescriptorOffchain.s.sol

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would prefer if we can read from the config though, so future devs knows that params and can deploy this easily

* --broadcast \
* --slow \
* --verify
*/
contract DeployCLPositionDescriptorOffChainScript is BaseScript {
function run(string memory baseTokenURI) public {
uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(deployerPrivateKey);

CLPositionDescriptorOffChain clPositionDescriptor = new CLPositionDescriptorOffChain(baseTokenURI);
emit log_named_address("CLPositionDescriptorOffChain", address(clPositionDescriptor));

vm.stopBroadcast();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import {IVault} from "pancake-v4-core/src/interfaces/IVault.sol";
import {ICLPoolManager} from "pancake-v4-core/src/pool-cl/interfaces/ICLPoolManager.sol";
import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol";
import {CLPositionManager} from "../src/pool-cl/CLPositionManager.sol";
import {ICLPositionDescriptor} from "../src/pool-cl/interfaces/ICLPositionDescriptor.sol";

/**
* forge script --sig 'run(uint256)' script/01_DeployCLPositionManager.s.sol:DeployCLPositionManagerScript <unsubscribeGasLimit> -vvv \
* forge script --sig 'run(uint256)' script/02_DeployCLPositionManager.s.sol:DeployCLPositionManagerScript <unsubscribeGasLimit> -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand All @@ -29,8 +30,15 @@ contract DeployCLPositionManagerScript is BaseScript {
address permit2 = getAddressFromConfig("permit2");
emit log_named_address("Permit2", permit2);

address clPositionDescriptor = getAddressFromConfig("clPositionDescriptor");
emit log_named_address("CLPositionDescriptor", clPositionDescriptor);

CLPositionManager clPositionManager = new CLPositionManager(
IVault(vault), ICLPoolManager(clPoolManager), IAllowanceTransfer(permit2), unsubscribeGasLimit
IVault(vault),
ICLPoolManager(clPoolManager),
IAllowanceTransfer(permit2),
unsubscribeGasLimit,
ICLPositionDescriptor(clPositionDescriptor)
);
emit log_named_address("CLPositionManager", address(clPositionManager));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"
import {BinPositionManager} from "../src/pool-bin/BinPositionManager.sol";

/**
* forge script script/02_DeployBinPositionManager.s.sol:DeployBinPositionManagerScript -vvv \
* forge script script/03_DeployBinPositionManager.s.sol:DeployBinPositionManagerScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {BaseScript} from "./BaseScript.sol";
import {CLQuoter} from "../src/pool-cl/lens/CLQuoter.sol";

/**
* forge script script/03_DeployCLQuoter.s.sol:DeployCLQuoterScript -vvv \
* forge script script/04_DeployCLQuoter.s.sol:DeployCLQuoterScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {BaseScript} from "./BaseScript.sol";
import {BinQuoter} from "../src/pool-bin/lens/BinQuoter.sol";

/**
* forge script script/04_DeployBinQuoter.s.sol:DeployBinQuoterScript -vvv \
* forge script script/05_DeployBinQuoter.s.sol:DeployBinQuoterScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"
import {CLMigrator} from "../src/pool-cl/CLMigrator.sol";

/**
* forge script script/05_DeployCLMigrator.s.sol:DeployCLMigratorScript -vvv \
* forge script script/06_DeployCLMigrator.s.sol:DeployCLMigratorScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"
import {BinMigrator} from "../src/pool-bin/BinMigrator.sol";

/**
* forge script script/06_DeployBinMigrator.s.sol:DeployBinMigratorScript -vvv \
* forge script script/07_DeployBinMigrator.s.sol:DeployBinMigratorScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {ICLQuoter} from "../src/pool-cl/interfaces/ICLQuoter.sol";
import {MixedQuoter} from "../src/MixedQuoter.sol";

/**
* forge script script/07_DeployMixedQuoter.s.sol:DeployMixedQuoterScript -vvv \
* forge script script/08_DeployMixedQuoter.s.sol:DeployMixedQuoterScript -vvv \
* --rpc-url $RPC_URL \
* --broadcast \
* --slow \
Expand Down
1 change: 1 addition & 0 deletions script/config/bsc-testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"vault": "0x0a125Bb36e409957Ed951eF1FBe20e81D682EAb6",
"clPoolManager": "0x26Ca53c8C5CE90E22aA1FadDA68AB9a08f7BA06f",
"binPoolManager": "0x1DF0be383e9d17DA4448E57712849aBE5b3Fa33b",
"clPositionDescriptor": "0x",
"clPositionManager": "0x095bd2cf90ef113aa8c53904cE54C17f4583046d",
"binPositionManager": "0x26008c91a2D47147d6739db3fFd3598A27da859d",
"clQuoter": "0xcC2d7c533444BE73F15de4C20F4a4773966989dC",
Expand Down
1 change: 1 addition & 0 deletions script/config/ethereum-mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"vault": "0x",
"clPoolManager": "0x",
"binPoolManager": "0x",
"clPositionDescriptor": "0x",
"clPositionManager": "0x",
"binPositionManager": "0x",
"clQuoter:": "0x",
Expand Down
1 change: 1 addition & 0 deletions script/config/ethereum-sepolia.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"vault": "0x4670F769Daa625FF5F89719AE5295E9824f5805f",
"clPoolManager": "0xD4EAc75ee0E76EAD6AC6995DF30CA14b38549682",
"binPoolManager": "0x0Ca8430E263A098B998E47e0544C2C82B30CbDB1",
"clPositionDescriptor": "0x",
"clPositionManager": "0x53C9802F47295979c0E154779eD10fa6af27D7cA",
"binPositionManager": "0x21015eF9927e06b7Fc19D986A214e449Aa22FF7d",
"clQuoter": "0x6B71bA938100FD313Be08E680639900E0cfE3d74",
Expand Down
Loading
Loading