-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from axieinfinity/merge/release/v0.2.0-feature…
…/upgrade chore(`upgrade`): merge from `release/v0.2.0`
- Loading branch information
Showing
4 changed files
with
190 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,170 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.19; | ||
|
|
||
| import { CommonBase } from "../../lib/forge-std/src/Base.sol"; | ||
| import { LibString } from "../../lib/solady/src/utils/LibString.sol"; | ||
| import { IWalletConfig } from "../interfaces/configs/IWalletConfig.sol"; | ||
|
|
||
| abstract contract WalletConfig is IWalletConfig { | ||
| uint256 internal _envPk; | ||
| abstract contract WalletConfig is CommonBase, IWalletConfig { | ||
| using LibString for string; | ||
|
|
||
| string internal _envLabel; | ||
| address internal _envSender; | ||
| address internal _trezorSender; | ||
| WalletOption internal _walletOption; | ||
|
|
||
| function getSender() public view virtual returns (address payable sender); | ||
|
|
||
| function getSenderPk() public view virtual returns (uint256) { | ||
| return _envPk; | ||
| } | ||
|
|
||
| function trezorPrefix() public view virtual returns (string memory) { | ||
| return "trezor://"; | ||
| } | ||
|
|
||
| function deployerEnvLabel() public view virtual returns (string memory) { | ||
| return "DEPLOYER"; | ||
| } | ||
|
|
||
| function ethSignMessage(address by, string memory message, WalletOption walletOption) | ||
| public | ||
| returns (bytes memory sig) | ||
| { | ||
| sig = | ||
| walletOption == WalletOption.Env ? envEthSignMessage(by, message, _envLabel) : trezorEthSignMessage(by, message); | ||
| } | ||
|
|
||
| function ethSignMessage(string memory message) public returns (bytes memory sig) { | ||
| sig = _walletOption == WalletOption.Env | ||
| ? envEthSignMessage(_envSender, message, _envLabel) | ||
| : trezorEthSignMessage(_trezorSender, message); | ||
| } | ||
|
|
||
| function envEthSignMessage(address by, string memory message, string memory envLabel) | ||
| public | ||
| returns (bytes memory sig) | ||
| { | ||
| string[] memory commandInput = new string[](8); | ||
| commandInput[0] = "cast"; | ||
| commandInput[1] = "wallet"; | ||
| commandInput[2] = "sign"; | ||
| commandInput[3] = "--from"; | ||
| commandInput[4] = vm.toString(by); | ||
| commandInput[5] = "--private-key"; | ||
| commandInput[6] = LibString.toHexString(_loadENVPrivateKey(envLabel)); | ||
| commandInput[7] = message; | ||
|
|
||
| sig = vm.ffi(commandInput); | ||
| } | ||
|
|
||
| function trezorEthSignMessage(address by, string memory message) public returns (bytes memory sig) { | ||
| string[] memory commandInput = new string[](7); | ||
| commandInput[0] = "cast"; | ||
| commandInput[1] = "wallet"; | ||
| commandInput[2] = "sign"; | ||
| commandInput[3] = "--from"; | ||
| commandInput[4] = vm.toString(by); | ||
| commandInput[5] = "--trezor"; | ||
| commandInput[6] = message; | ||
|
|
||
| sig = vm.ffi(commandInput); | ||
| } | ||
|
|
||
| function signTypedDataV4(address by, string memory filePath, WalletOption walletOption) | ||
| public | ||
| returns (bytes memory sig) | ||
| { | ||
| sig = walletOption == WalletOption.Env | ||
| ? envSignTypedDataV4(by, filePath, _envLabel) | ||
| : trezorSignTypedDataV4(by, filePath); | ||
| } | ||
|
|
||
| function signTypedDataV4(string memory filePath) public returns (bytes memory sig) { | ||
| sig = _walletOption == WalletOption.Env | ||
| ? envSignTypedDataV4(_envSender, filePath, _envLabel) | ||
| : trezorSignTypedDataV4(_trezorSender, filePath); | ||
| } | ||
|
|
||
| function envSignTypedDataV4(address by, string memory filePath, string memory envLabel) | ||
| public | ||
| returns (bytes memory sig) | ||
| { | ||
| string[] memory commandInput = new string[](10); | ||
| commandInput[0] = "cast"; | ||
| commandInput[1] = "wallet"; | ||
| commandInput[2] = "sign"; | ||
| commandInput[3] = "--from"; | ||
| commandInput[4] = vm.toString(by); | ||
| commandInput[5] = "--private-key"; | ||
| commandInput[6] = LibString.toHexString(_loadENVPrivateKey(envLabel)); | ||
| commandInput[7] = "--data"; | ||
| commandInput[8] = "--from-file"; | ||
| commandInput[9] = filePath; | ||
|
|
||
| sig = vm.ffi(commandInput); | ||
| } | ||
|
|
||
| function trezorSignTypedDataV4(address by, string memory filePath) public returns (bytes memory sig) { | ||
| string[] memory commandInput = new string[](9); | ||
| commandInput[0] = "cast"; | ||
| commandInput[1] = "wallet"; | ||
| commandInput[2] = "sign"; | ||
| commandInput[3] = "--from"; | ||
| commandInput[4] = vm.toString(by); | ||
| commandInput[5] = "--trezor"; | ||
| commandInput[6] = "--data"; | ||
| commandInput[7] = "--from-file"; | ||
| commandInput[8] = filePath; | ||
|
|
||
| sig = vm.ffi(commandInput); | ||
| } | ||
|
|
||
| function _loadTrezorAccount() internal { | ||
| if (tx.origin != DEFAULT_SENDER) { | ||
| _trezorSender = tx.origin; | ||
| } else { | ||
| try vm.envString(deployerEnvLabel()) returns (string memory str) { | ||
| _trezorSender = vm.parseAddress(str.replace(trezorPrefix(), "")); | ||
| } catch { | ||
| revert( | ||
| string.concat( | ||
| "\nGeneralConfig: Error finding trezor address!\n- Please override default sender with `--sender {your_trezor_account}` tag \n- Or make `.env` file and create field `", | ||
| deployerEnvLabel(), | ||
| "=", | ||
| trezorPrefix(), | ||
| "{your_trezor_account}`" | ||
| ) | ||
| ); | ||
| } | ||
| } | ||
| _walletOption = WalletOption.Trezor; | ||
| } | ||
|
|
||
| function _loadENVAccount(string memory envLabel) internal { | ||
| _envLabel = envLabel; | ||
| _walletOption = WalletOption.Env; | ||
| _envSender = vm.rememberKey(_loadENVPrivateKey(envLabel)); | ||
| } | ||
|
|
||
| function _loadENVPrivateKey(string memory envLabel) private returns (uint256) { | ||
| try vm.envUint(envLabel) returns (uint256 pk) { | ||
| return pk; | ||
| } catch { | ||
| string[] memory commandInput = new string[](3); | ||
|
|
||
| try vm.envString(envLabel) returns (string memory data) { | ||
| commandInput[2] = data; | ||
| } catch { | ||
| revert( | ||
| string.concat( | ||
| "\nGeneralConfig: Error finding env address!\n- Please make `.env` file and create field `", | ||
| envLabel, | ||
| "=", | ||
| "{op_secret_reference_or_your_private_key}`" | ||
| ) | ||
| ); | ||
| } | ||
| commandInput[0] = "op"; | ||
| commandInput[1] = "read"; | ||
|
|
||
| return vm.parseUint(vm.toString(vm.ffi(commandInput))); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters