Merge branch 'main' into marktanrj/updatemasternode-rpc-typing

DeFiCh · Nov 29, 2022 · 3c35b7e · 3c35b7e
2 parents f4620aa + 698a93d
commit 3c35b7e
Show file tree

Hide file tree

Showing 11 changed files with 957 additions and 141 deletions.
diff --git a/apps/package.json b/apps/package.json
@@ -80,9 +80,9 @@
     "@types/node": "16.11.58",
     "@types/subleveldown": "^4.1.1",
     "@types/supertest": "2.0.12",
-    "@types/validator": "13.7.8",
+    "@types/validator": "13.7.10",
     "source-map-support": "0.5.21",
-    "supertest": "6.3.0",
+    "supertest": "6.3.1",
     "testcontainers": "8.15.0",
     "ts-loader": "9.4.1",
     "ts-node": "10.9.1",

diff --git a/apps/rich-list-api/docker-compose.yml b/apps/rich-list-api/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_DB: defichainrichlist
 
   defi-blockchain:
-    image: defi/defichain:3.0.0
+    image: defi/defichain:3.0.1
     ports:
       - "19554:19554"
     command: >
@@ -49,3 +49,4 @@ services:
       -fortcanningepilogueheight=15
       -grandcentralheight=16
       -regtest-skip-loan-collateral-validation
+      -regtest-minttoken-simulate-mainnet=0
diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   defi-blockchain:
-    image: defi/defichain:3.0.0
+    image: defi/defichain:3.0.1
     ports:
       - "19554:19554"
     command: >
@@ -38,6 +38,7 @@ services:
       -fortcanningepilogueheight=15
       -grandcentralheight=16
       -regtest-skip-loan-collateral-validation
+      -regtest-minttoken-simulate-mainnet=0
 
   defi-whale:
     build: