Skip to content

Support signing with keystores #16

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.

Sign up for GitHub

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

Open
matmilbury wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −17
Open

Support signing with keystores #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 25 additions & 17 deletions src/BatchScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ abstract contract BatchScript is Script, DelegatePrank {
bytes32 private walletType;
uint256 private mnemonicIndex;
bytes32 private privateKey;
string private account;
string private passwordFile;

bytes32 private constant LOCAL = keccak256("local");
bytes32 private constant LEDGER = keccak256("ledger");
bytes32 private constant KEYSTORE = keccak256("keystore");

enum Operation {
CALL,
Expand Down Expand Up @@ -163,6 +166,9 @@ abstract contract BatchScript is Script, DelegatePrank {
privateKey = vm.envBytes32("PRIVATE_KEY");
} else if (walletType == LEDGER) {
mnemonicIndex = vm.envUint("MNEMONIC_INDEX");
} else if (walletType == KEYSTORE) {
account = vm.envString("ACCOUNT");
passwordFile = vm.envString("PASSWORD_FILE");
} else {
revert("Unsupported wallet type");
}
Expand Down Expand Up @@ -214,6 +220,8 @@ abstract contract BatchScript is Script, DelegatePrank {
vm.toString(mnemonicIndex),
" "
);
} else if (walletType == KEYSTORE) {
wallet = string.concat("--account ", account, " --password-file ", passwordFile, " ");
} else {
revert("Unsupported wallet type");
}
Expand Down Expand Up @@ -297,28 +305,28 @@ abstract contract BatchScript is Script, DelegatePrank {
) internal view returns (bytes32) {
return
keccak256(
abi.encodePacked(
hex"1901",
abi.encodePacked(
hex"1901",
keccak256(
abi.encode(DOMAIN_SEPARATOR_TYPEHASH, chainId, safe_)
),
keccak256(
abi.encode(
SAFE_TX_TYPEHASH,
batch_.to,
batch_.value,
keccak256(batch_.data),
batch_.operation,
batch_.safeTxGas,
batch_.baseGas,
batch_.gasPrice,
address(0),
address(0),
batch_.nonce
)
keccak256(
abi.encode(
SAFE_TX_TYPEHASH,
batch_.to,
batch_.value,
keccak256(batch_.data),
batch_.operation,
batch_.safeTxGas,
batch_.baseGas,
batch_.gasPrice,
address(0),
address(0),
batch_.nonce
)
)
);
)
);
}

function _getTypedData(
Expand Down