Chia 1.3.1 Code

BTCgreen-Network · Mar 18, 2022 · b1e41e8 · b1e41e8
1 parent a8c0bca
commit b1e41e8
Show file tree

Hide file tree

Showing 51 changed files with 736 additions and 559 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -54,10 +54,10 @@ repos:
     hooks:
     - id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.930
+    rev: v0.940
     hooks:
     - id: mypy
-      additional_dependencies: [pytest, pytest-asyncio, types-aiofiles, types-click, types-setuptools, types-PyYAML]
+      additional_dependencies: [filelock, pytest, pytest-asyncio, types-aiofiles, types-click, types-setuptools, types-PyYAML]
       # This intentionally counters the settings in mypy.ini to allow a loose local
       # check and a strict CI check. This difference may or may not be retained long
       # term.

diff --git a/setup.py b/setup.py
@@ -18,6 +18,7 @@
     "concurrent-log-handler==0.9.19",  # Concurrently log and rotate logs
     "cryptography==3.4.7",  # Python cryptography library for TLS - keyring conflict
     "fasteners==0.16.3",  # For interprocess file locking
+    "filelock==3.4.2", # For reading and writing config multiprocess and multithread safely (non-reentrant locks)
     "keyring==23.0.1",  # Store keys in MacOS Keychain, Windows Credential Locker
     "keyrings.cryptfile==1.3.4",  # Secure storage for keys on Linux (Will be replaced)
     #  "keyrings.cryptfile==1.3.8",  # Secure storage for keys on Linux (Will be replaced)
@@ -45,7 +46,7 @@
     "build",
     "pre-commit",
     "pytest",
-    "pytest-asyncio",
+    "pytest-asyncio>=0.18.1", # require attribute 'fixture'
     "pytest-monitor; sys_platform == 'linux'",
     "pytest-xdist",
     "twine",

diff --git a/shibgreen-blockchain-gui/packages/api-react/src/services/farmer.ts b/shibgreen-blockchain-gui/packages/api-react/src/services/farmer.ts
@@ -27,7 +27,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
         ? [
           ...harvesters.map(({ id }) => ({ type: 'Harvesters', id } as const)),
           { type: 'Harvesters', id: 'LIST' },
-        ] 
+        ]
         :  [{ type: 'Harvesters', id: 'LIST' }],
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, [{
         command: 'onHarvesterChanged',
@@ -36,10 +36,10 @@ export const farmerApi = apiWithTag.injectEndpoints({
       }]),
     }),
 
-    getRewardTargets: build.query<undefined, { 
-      searchForPrivateKey: boolean; 
+    getRewardTargets: build.query<undefined, {
+      searchForPrivateKey?: boolean;
     }>({
-      query: ({ searchForPrivateKey }) => ({
+      query: ({ searchForPrivateKey } = {}) => ({
         command: 'getRewardTargets',
         service: Farmer,
         args: [searchForPrivateKey],
@@ -48,7 +48,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
       providesTags: ['RewardTargets']
     }),
 
-    setRewardTargets: build.mutation<RewardTargets, { 
+    setRewardTargets: build.mutation<RewardTargets, {
       farmerTarget: string;
       poolTarget: string;
     }>({
@@ -70,7 +70,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
         ? [
           ...connections.map(({ nodeId }) => ({ type: 'FarmerConnections', id: nodeId } as const)),
           { type: 'FarmerConnections', id: 'LIST' },
-        ] 
+        ]
         : [{ type: 'FarmerConnections', id: 'LIST' }],
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, [{
         command: 'onConnections',
@@ -84,7 +84,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
         },
       }]),
     }),
-    openFarmerConnection: build.mutation<FarmerConnection, { 
+    openFarmerConnection: build.mutation<FarmerConnection, {
       host: string;
       port: number;
     }>({
@@ -95,7 +95,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
       }),
       invalidatesTags: [{ type: 'FarmerConnections', id: 'LIST' }],
     }),
-    closeFarmerConnection: build.mutation<FarmerConnection, { 
+    closeFarmerConnection: build.mutation<FarmerConnection, {
       nodeId: string;
     }>({
       query: ({ nodeId }) => ({
@@ -129,7 +129,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
         ? [
           ...signagePoints.map(({ signagePoint }) => ({ type: 'SignagePoints', id: signagePoint?.challengeHash } as const)),
           { type: 'SignagePoints', id: 'LIST' },
-        ] 
+        ]
         :  [{ type: 'SignagePoints', id: 'LIST' }],
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, [{
         command: 'onNewSignagePoint',
@@ -150,11 +150,11 @@ export const farmerApi = apiWithTag.injectEndpoints({
         ? [
           ...poolsList.map(({ p2SingletonPuzzleHash }) => ({ type: 'Pools', id: p2SingletonPuzzleHash } as const)),
           { type: 'Pools', id: 'LIST' },
-        ] 
+        ]
         :  [{ type: 'Pools', id: 'LIST' }],
     }),
 
-    setPayoutInstructions: build.mutation<undefined, { 
+    setPayoutInstructions: build.mutation<undefined, {
       launcherId: string;
       payoutInstructions: string;
     }>({
@@ -184,7 +184,7 @@ export const farmerApi = apiWithTag.injectEndpoints({
 
 // TODO add new farming info query and event for last_attepmtp_proofs
 
-export const { 
+export const {
   useFarmerPingQuery,
   useGetHarvestersQuery,
   useGetRewardTargetsQuery,