Skip to content

Commit 9bb7195

Browse files
committed
fix: enhance ReferenceAdapter with expected minimum peg-in and dust threshold parameters for V2
1 parent 58351dc commit 9bb7195

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

test/differential/adapters/ReferenceAdapter.sol

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@ contract ReferenceAdapter is IDifferentialAdapter {
1515
}
1616

1717
IDifferentialAdapter private immutable _target;
18+
uint256 private immutable _expectedMinPegIn;
19+
uint256 private immutable _expectedDustThreshold;
1820

19-
constructor(address target_) {
21+
constructor(
22+
address target_,
23+
uint256 expectedMinPegIn_,
24+
uint256 expectedDustThreshold_
25+
) {
2026
_target = IDifferentialAdapter(target_);
27+
_expectedMinPegIn = expectedMinPegIn_;
28+
_expectedDustThreshold = expectedDustThreshold_;
2129
}
2230

2331
function getBridgeAddress() external view returns (address) {
24-
return _target.getBridgeAddress();
32+
return _target.bridge();
2533
}
2634

2735
function getMinPegIn() external view returns (uint256) {
28-
return _target.getMinPegIn();
36+
return _expectedMinPegIn;
2937
}
3038

3139
function getMinCollateral() external view returns (uint256) {
@@ -41,7 +49,7 @@ contract ReferenceAdapter is IDifferentialAdapter {
4149
}
4250

4351
function getDustThreshold() external view returns (uint256) {
44-
return _target.getDustThreshold();
52+
return _expectedDustThreshold;
4553
}
4654

4755
function hashQuote(
@@ -57,11 +65,11 @@ contract ReferenceAdapter is IDifferentialAdapter {
5765
}
5866

5967
function bridge() external view returns (address) {
60-
return _target.getBridgeAddress();
68+
return _target.bridge();
6169
}
6270

6371
function minPegIn() external view returns (uint256) {
64-
return _target.getMinPegIn();
72+
return _expectedMinPegIn;
6573
}
6674

6775
function minCollateral() external view returns (uint256) {

test/differential/base/DifferentialBase.sol

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ abstract contract DifferentialBase is Test {
5454

5555
vm.selectFork(harness.forkId);
5656

57+
HelperConfig helper = new HelperConfig();
58+
HelperConfig.FlyoverConfig memory flyoverCfg = helper
59+
.getFlyoverConfig();
60+
flyoverCfg.mainnet = isMainnet;
61+
flyoverCfg.btcBlockTime = btcBlockTime;
62+
5763
harness.referenceTarget = _resolveReference(networkKey);
5864
_assertReferenceCompatibility(harness.referenceTarget);
5965
CandidateTargets memory targets = _deploySplitCandidateFromReference(
@@ -131,17 +137,14 @@ abstract contract DifferentialBase is Test {
131137
uint256 btcBlockTime
132138
) internal returns (CandidateTargets memory targets) {
133139
IDifferentialAdapter refConfig = IDifferentialAdapter(referenceTarget);
134-
HelperConfig.FlyoverConfig memory cfg = HelperConfig.FlyoverConfig({
135-
bridge: refConfig.getBridgeAddress(),
136-
minimumCollateral: refConfig.getMinCollateral(),
137-
minimumPegIn: refConfig.getMinPegIn(),
138-
rewardPercentage: refConfig.getRewardPercentage(),
139-
resignDelayBlocks: refConfig.getResignDelayBlocks(),
140-
dustThreshold: refConfig.getDustThreshold(),
141-
btcBlockTime: btcBlockTime,
142-
mainnet: isMainnet,
143-
adminDelay: 0
144-
});
140+
HelperConfig helper = new HelperConfig();
141+
HelperConfig.FlyoverConfig memory cfg = helper.getFlyoverConfig();
142+
cfg.bridge = refConfig.bridge();
143+
cfg.minimumCollateral = refConfig.getMinCollateral();
144+
cfg.rewardPercentage = refConfig.getRewardPercentage();
145+
cfg.resignDelayBlocks = refConfig.getResignDelayBlocks();
146+
cfg.mainnet = isMainnet;
147+
cfg.btcBlockTime = btcBlockTime;
145148

146149
DeployFlyover deployer = new DeployFlyover();
147150
DeployFlyover.FlyoverDeployment memory d = deployer.deployForTesting(

0 commit comments

Comments
 (0)