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

fix: use correct sender #13

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
66 changes: 66 additions & 0 deletions Deploy.modules.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
[deployments]
rpcs = [
# Mainnet
# "https://eth.llamarpc.com",
"http://localhost:8545",
#"https://1rpc.io/sepolia",

# Optimism
#"https://optimism.llamarpc.com",
#"https://sepolia.optimism.io",

# Base
#"https://base.llamarpc.com",
#"https://sepolia.base.org",

# Arbitrum
#"https://arbitrum.llamarpc.com",
#"https://public.stackup.sh/api/v1/node/arbitrum-sepolia",

# Polygon
#"https://polygon.llamarpc.com",
#"https://polygon-amoy.drpc.org",
#"https://rpc-amoy.polygon.technology",

# Gnosis
#"https://gnosis-pokt.nodies.app",
#"https://rpc.chiadochain.net",

# Mantle
#"https://rpc.mantle.xyz",

# Avalanche
#"https://1rpc.io/avax/c",
#"https://rpc.ankr.com/avalanche_fuji",

# Celo
#"https://celo.drpc.org",
#"https://alfajores-forno.celo-testnet.org",

# Fuse
#"https://fuse-pokt.nodies.app",
#"https://rpc.fusespark.io",

# Scroll
#"https://scroll-sepolia.drpc.org",
]


[deployments.dependencies]
entrypoint = "0x0000000071727De22E5E9d8BAf0edAc6f37da032"
proxy_admin = "0x0000000071727De22E5E9d8BAf0edAc6f37da032" #todo

#[deployments.registry]
#address = "0x000000000069E2a187AEFFb852bF3cCdC95151B2"
#abi_url = "https://raw.githubusercontent.com/rhinestonewtf/registry/main/artifacts/Registry.json"
#source_file_url = "https://github.com/rhinestonewtf/registry/actions/runs/11658850811/artifacts/2139346917"
#file = "./src/artifacts/registry.json"
#salt = "0x0000000000000000000000000000000000000000d7f995ff1ea60f02e52877f7"



[deployments.module.deadmanswitch]
source_file_url = "https://raw.githubusercontent.com/rhinestonewtf/core-modules/main/artifacts/DeadmanSwitch/verify.json"
abi_url = "https://raw.githubusercontent.com/rhinestonewtf/core-modules/main/artifacts/DeadmanSwitch.json"
file = ""
salt = "0x0000000000000000000000000000000000000000e5068a3f93a9e201a1832999"
Empty file modified build-artifacts.sh
100644 → 100755
Empty file.
19 changes: 0 additions & 19 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,6 @@ fs_permissions = [{ access = "read", path = "out-optimized" }, { access = "read-
allow_paths = ["*", "/"]


[etherscan]
arbitrum = { key = "${API_KEY_ARBISCAN}", chain="arbitrum" }
avalanche = { key = "${API_KEY_ETHERSCAN}", chain="avalanche" }
avalanche-fuji = { key = "${API_KEY_ETHERSCAN}", chain="avalanche-fuji" }
#mainnet = { key = "${API_KEY_ETHERSCAN}" }
optimism = { key = "${API_KEY_OPTISM_ETHERSCAN}", chain="optimism"}
optimism-sepolia = { key = "${API_KEY_OPTIMISM_ETHERSCAN}", chain="optimism-sepolia"}
polygon = { key = "${API_KEY_POLYGONSCAN}", chain="polygon"}
polygon-amoy = { key = "${API_KEY_POLYGONSCAN}", chain="polygon-amoy"}
sepolia = { key = "${API_KEY_ETHERSCAN}", chain="sepolia"}
#gnosis-chidao = { key = "${API_KEY_GNOSISSCAN}", chain="gnosis-chidao"}
gnosis = { key = "${API_KEY_GNOSISSCAN}", chain="gnosis"}
bsc = { key = "${API_KEY_BSCSCAN}", chain="bsc"}
bsc-testnet = { key = "${API_KEY_BSCSCAN}", chain="bsc-testnet"}
base = {key = "${API_KEY_BASESCAN}", chain="base"}
#base-sepolia = {key = "${API_KEY_BASESCAN}", chain="base-sepolia"}
scroll = {key = "${API_KEY_SCROLLSCAN}", chain="scroll"}
#scroll-testnet = {key = "${API_KEY_SCROLLSCAN}", chain="scroll-testnet"}


[rpc_endpoints]
arbitrum = "https://arb-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
Expand Down
4 changes: 2 additions & 2 deletions src/DeadmanSwitch/DeadmanSwitch.sol
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

// account => config
mapping(address account => DeadmanSwitchStorage) public config;

Check warning on line 29 in src/DeadmanSwitch/DeadmanSwitch.sol

View workflow job for this annotation

GitHub Actions / lint / forge-lint

Value parameter in mapping config is not named

error UnsupportedOperation();

Expand Down Expand Up @@ -180,7 +180,7 @@
returns (ValidationData)
{
// get the config for the sender
DeadmanSwitchStorage memory _config = config[userOp.sender];
DeadmanSwitchStorage memory _config = config[msg.sender];
// get the nominee
address nominee = _config.nominee;
// if nominee is not set, return validation failed
Expand All @@ -194,7 +194,7 @@

uint48 validAfter = _config.lastAccess + _config.timeout;

config[userOp.sender].timeout = 0;
config[msg.sender].timeout = 0;

// return validation data
// if signature is invalid, validation fails
Expand Down
Loading