Skip to content

Commit

Permalink
Merge pull request symbioticfi#71 from symbioticfi/etherscan
Browse files Browse the repository at this point in the history
Remove etherscan from .toml
  • Loading branch information
1kresh authored Oct 31, 2024
2 parents f38f1b1 + b2ce499 commit 629b9fa
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
3 changes: 0 additions & 3 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,5 @@ tab_width = 4
runs = 4096
max_test_rejects = 262144

[etherscan]
mainnet = { key = "${ETHERSCAN_API_KEY}" }
holesky = { key = "${ETHERSCAN_API_KEY}" }

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
12 changes: 7 additions & 5 deletions script/deploy/Vault.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ contract VaultScript is Script {
address vaultConfigurator,
address owner,
address collateral,
address burner,
uint48 epochDuration,
bool depositWhitelist,
uint256 depositLimit,
Expand All @@ -31,8 +32,8 @@ contract VaultScript is Script {

bytes memory vaultParams = abi.encode(
IVault.InitParams({
collateral: address(collateral),
burner: address(0xdEaD),
collateral: collateral,
burner: burner,
epochDuration: epochDuration,
depositWhitelist: depositWhitelist,
isDepositLimit: depositLimit != 0,
Expand Down Expand Up @@ -93,12 +94,13 @@ contract VaultScript is Script {

bytes memory slasherParams;
if (slasherIndex == 0) {
slasherParams =
abi.encode(ISlasher.InitParams({baseParams: IBaseSlasher.BaseParams({isBurnerHook: false})}));
slasherParams = abi.encode(
ISlasher.InitParams({baseParams: IBaseSlasher.BaseParams({isBurnerHook: burner != address(0)})})
);
} else if (slasherIndex == 1) {
slasherParams = abi.encode(
IVetoSlasher.InitParams({
baseParams: IBaseSlasher.BaseParams({isBurnerHook: false}),
baseParams: IBaseSlasher.BaseParams({isBurnerHook: burner != address(0)}),
vetoDuration: vetoDuration,
resolverSetEpochsDelay: 3
})
Expand Down
12 changes: 7 additions & 5 deletions script/deploy/VaultTokenized.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ contract VaultTokenizedScript is Script {
address vaultConfigurator,
address owner,
address collateral,
address burner,
uint48 epochDuration,
bool depositWhitelist,
uint256 depositLimit,
Expand All @@ -35,8 +36,8 @@ contract VaultTokenizedScript is Script {
bytes memory vaultParams = abi.encode(
IVaultTokenized.InitParamsTokenized({
baseParams: IVault.InitParams({
collateral: address(collateral),
burner: address(0xdEaD),
collateral: collateral,
burner: burner,
epochDuration: epochDuration,
depositWhitelist: depositWhitelist,
isDepositLimit: depositLimit != 0,
Expand Down Expand Up @@ -100,12 +101,13 @@ contract VaultTokenizedScript is Script {

bytes memory slasherParams;
if (slasherIndex == 0) {
slasherParams =
abi.encode(ISlasher.InitParams({baseParams: IBaseSlasher.BaseParams({isBurnerHook: false})}));
slasherParams = abi.encode(
ISlasher.InitParams({baseParams: IBaseSlasher.BaseParams({isBurnerHook: burner != address(0)})})
);
} else if (slasherIndex == 1) {
slasherParams = abi.encode(
IVetoSlasher.InitParams({
baseParams: IBaseSlasher.BaseParams({isBurnerHook: false}),
baseParams: IBaseSlasher.BaseParams({isBurnerHook: burner != address(0)}),
vetoDuration: vetoDuration,
resolverSetEpochsDelay: 3
})
Expand Down
4 changes: 2 additions & 2 deletions specs/Vault.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ _Common Vault_
Deployment script: [click](../script/deploy/Vault.s.sol)

```shell
forge script script/deploy/Vault.s.sol:VaultScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 1 false 0 0 false 0 0 --sig "run(address,address,address,uint48,bool,uint256,uint64,bool,uint64,uint48)" --broadcast --rpc-url=$ETH_RPC_URL
forge script script/deploy/Vault.s.sol:VaultScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 1 false 0 0 false 0 0 --sig "run(address,address,address,address,uint48,bool,uint256,uint64,bool,uint64,uint48)" --broadcast --rpc-url=$ETH_RPC_URL
```

_Tokenized Vault_

Deployment script: [click](../script/deploy/VaultTokenized.s.sol)

```shell
forge script script/deploy/VaultTokenized.s.sol:VaultTokenizedScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 1 false 0 Test TEST 0 false 0 0 --sig "run(address,address,address,uint48,bool,uint256,string,string,uint64,bool,uint64,uint48)" --broadcast --rpc-url=$ETH_RPC_URL
forge script script/deploy/VaultTokenized.s.sol:VaultTokenizedScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 1 false 0 Test TEST 0 false 0 0 --sig "run(address,address,address,address,uint48,bool,uint256,string,string,uint64,bool,uint64,uint48)" --broadcast --rpc-url=$ETH_RPC_URL
```

0 comments on commit 629b9fa

Please sign in to comment.