Merge branch 'main' into shohamc1/tokens-rpcs

BirthdayResearch · Nov 29, 2022 · 300701d · 300701d
2 parents 2a5aa8e + 68d604a
commit 300701d
Show file tree

Hide file tree

Showing 14 changed files with 1,574 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:

diff --git a/docs/node/CATEGORIES/11-masternode.md b/docs/node/CATEGORIES/11-masternode.md
@@ -172,6 +172,23 @@ interface UTXO {
 }
 ```
 
+## updatemasternode
+
+Creates (and submits to local node and network) a masternode update transaction which update the masternode operator addresses, spending the given inputs..
+The last optional argument (may be empty array) is an array of specific UTXOs to spend.
+
+```ts title="client.masternode.updatemasternode()"
+interface masternode {
+  updateMasternode(masternodeId: string, values: UpdateMasternodeValues, utxos: UTXO[] = []): Promise<string>
+}
+
+interface UpdateMasternodeValues {
+  ownerAddress?: string
+  operatorAddress?: string
+  rewardAddress?: string
+}
+```
+
 ## setGov
 
 Set special governance variables