Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This overrides the `auto_detect_solc` value
solc_version = '0.8.21'
auto_detect_solc = false
evm_version = 'london'
evm_version = 'cancun'
optimizer = true
optimizer_runs = 200
fs_permissions = [{ access = "read-write", path = "./" }]
Expand Down
741 changes: 485 additions & 256 deletions leafs/Katana/GoldenGooseStrategistLeafs.json

Large diffs are not rendered by default.

14,891 changes: 7,449 additions & 7,442 deletions leafs/Mainnet/GoldenGooseStrategistLeafs.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ contract CreateGoldenGooseMerkleRoot is Script, MerkleTreeHelper {
setAddress(false, katana, "accountantAddress", accountantAddress);
setAddress(false, katana, "rawDataDecoderAndSanitizer", rawDataDecoderAndSanitizer);

ManageLeaf[] memory leafs = new ManageLeaf[](16);
ManageLeaf[] memory leafs = new ManageLeaf[](32);

// ========================== Native Wrapping ==========================
_addNativeLeafs(leafs);
Expand All @@ -54,9 +54,17 @@ contract CreateGoldenGooseMerkleRoot is Script, MerkleTreeHelper {
20,
0
);
_addAgglayerTokenLeafs(
leafs,
getAddress(sourceChain, "agglayerBridgeKatana"),
getAddress(sourceChain, "WSTETH"),
20,
0
);

// ========================== Yearn ==========================
_addYearnLeafs(leafs, ERC4626(getAddress(sourceChain, "yvbWETH")));
_addYearnLeafs(leafs, ERC4626(getAddress(sourceChain, "yvWSTETH")));

// ========================== Verify & Generate ==========================

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,13 @@ contract CreateGoldenGooseMerkleRoot is Script, MerkleTreeHelper {
0, // Mainnet chain ID in Agglayer
20 // Katana chain ID in Agglayer
);
_addAgglayerTokenLeafs(
leafs,
getAddress(sourceChain, "agglayerBridgeKatana"),
getAddress(sourceChain, "WSTETH"),
0, // Mainnet chain ID in Agglayer
20 // Katana chain ID in Agglayer
);

// ========================== Layer Zero ==========================
// to Base
Expand Down
1 change: 1 addition & 0 deletions test/resources/ChainValues.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2915,6 +2915,7 @@ contract ChainValues {

// Yearn
values[katana]["yvbWETH"] = 0xE007CA01894c863d7898045ed5A3B4Abf0b18f37.toBytes32();
values[katana]["yvWSTETH"] = 0x1769111aA8EA46fee3BA23EF9B57F3CBe1873408.toBytes32();
}

function _addTACValues() private {
Expand Down