starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-09-27 17:46:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken cryptfile version, default ram in UI, and fix redux dev tools brave (#450)

Browse Source
This commit is contained in:
Mariano Sorgente
2020-10-07 15:45:29 +09:00
committed by GitHub
parent aef86049a8
commit a2fd4fa3bc
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron-react/src/modules/store.js
+2 -3
View File
@@ -13,9 +13,8 @@ const store =
: createStore(
rootReducer,
compose(
applyMiddleware(...middleware),
window.__REDUX_DEVTOOLS_EXTENSION__ &&
window.__REDUX_DEVTOOLS_EXTENSION__()
applyMiddleware(...middleware), /* preloadedState, */
window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__() || compose
)
);
electron-react/src/pages/Plotter.js
+17 -12
View File
@@ -193,18 +193,18 @@ const useStyles = makeStyles(theme => ({
}));
const plot_size_options = [
{ label: "600MiB", value: 25, workspace: "1.8GiB" },
{ label: "1.3GiB", value: 26, workspace: "3.6GiB" },
{ label: "2.7GiB", value: 27, workspace: "9.2GiB" },
{ label: "5.6GiB", value: 28, workspace: "19GiB" },
{ label: "11.5GiB", value: 29, workspace: "38GiB" },
{ label: "23.8GiB", value: 30, workspace: "83GiB" },
{ label: "49.1GiB", value: 31, workspace: "165GiB" },
{ label: "101.4GiB", value: 32, workspace: "331GiB" },
{ label: "208.8GiB", value: 33, workspace: "660GiB" },
{ label: "600MiB", value: 25, workspace: "1.8GiB", default_ram: 200 },
{ label: "1.3GiB", value: 26, workspace: "3.6GiB", default_ram: 200 },
{ label: "2.7GiB", value: 27, workspace: "9.2GiB", default_ram: 200 },
{ label: "5.6GiB", value: 28, workspace: "19GiB", default_ram: 200 },
{ label: "11.5GiB", value: 29, workspace: "38GiB", default_ram: 500 },
{ label: "23.8GiB", value: 30, workspace: "83GiB", default_ram: 1000 },
{ label: "49.1GiB", value: 31, workspace: "165GiB", default_ram: 2000 },
{ label: "101.4GiB", value: 32, workspace: "331GiB", default_ram: 3072 },
{ label: "208.8GiB", value: 33, workspace: "660GiB", default_ram: 6000 },
// workspace are guesses using 55.35% - rounded up - past here
{ label: "429.8GiB", value: 34, workspace: "1300GiB" },
{ label: "884.1GiB", value: 35, workspace: "2600GiB" }
{ label: "429.8GiB", value: 34, workspace: "1300GiB", default_ram: 12000 },
{ label: "884.1GiB", value: 35, workspace: "2600GiB", default_ram: 24000 }
];
const WorkLocation = () => {
@@ -329,7 +329,7 @@ const CreatePlot = () => {
const final_location = useSelector(
state => state.plot_control.final_location
);
const [plotSize, setPlotSize] = React.useState(25);
const [plotSize, setPlotSize] = React.useState(32);
const [plotCount, setPlotCount] = React.useState(1);
const [maxRam, setMaxRam] = React.useState(3072);
const [numThreads, setNumThreads] = React.useState(2);
@@ -338,6 +338,11 @@ const CreatePlot = () => {
const changePlotSize = event => {
setPlotSize(event.target.value);
for (let pso of plot_size_options) {
if (pso.value == event.target.value) {
setMaxRam(pso.default_ram);
}
}
};
const changePlotCount = event => {
setPlotCount(event.target.value);
setup.py
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies = [
"concurrent-log-handler==0.9.17", # Concurrently log and rotate logs
"cryptography==3.1.1", # Python cryptography library for TLS
"keyring==21.4.0", # Store keys in MacOS Keychain, Windows Credential Locker
"keyrings.cryptfile==1.3.6", # Secure storage for keys on Linux (Will be replaced)
"keyrings.cryptfile==1.3.4", # Secure storage for keys on Linux (Will be replaced)
"PyYAML==5.3.1", # Used for config file format
"sortedcontainers==2.2.2", # For maintaining sorted mempools
"websockets==8.1.0", # For use in wallet RPC and electron UI
src/cmds/init.py
+1 -1
View File
@@ -262,7 +262,7 @@ def chia_init(root_path: Path):
MANIFEST: List[str] = [
"config",
"db",
# "wallet",
"wallet",
]
for versionnumber in range(chiaMinorReleaseNumber() - 1, 8, -1):