From 1673e3585c4e524e796305bf46f08140f2d32f8f Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Fri, 18 Nov 2022 12:22:15 +0800
Subject: [PATCH 01/31] add dftx (WIP)

---
 .../src/script/dftx/dftx.ts                   |  2 ++
 .../src/script/dftx/dftx_masternode.ts        | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx.ts b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
index 9107da7928..bb171187fb 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
@@ -225,6 +225,8 @@ export class CDfTx extends ComposableBuffer<DfTx<any>> {
         return compose(CAutoAuthPrep.OP_NAME, () => new CAutoAuthPrep())
       case CCreateMasternode.OP_CODE:
         return compose<CreateMasternode>(CCreateMasternode.OP_NAME, d => new CCreateMasternode(d))
+      case CUpdateMasternode.OP_CODE:
+        return compose<CreateMasternode>(CUpdateMasternode.OP_NAME, d => new CUpdateMasternode(d))
       case CResignMasternode.OP_CODE:
         return compose<ResignMasternode>(CResignMasternode.OP_NAME, d => new CResignMasternode(d))
       case CSetGovernance.OP_CODE:
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index e4ba86499b..8980d2010c 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -59,3 +59,27 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
     ]
   }
 }
+
+/**
+ * UpdateMasternode DeFi Transaction
+ */
+export interface UpdateMasternode {
+  nodeId: string // --------------------------------| VarUInt{32 bytes}
+  // updates:
+}
+
+/**
+ * Composable UpdateMasternode, C stands for Composable.
+ * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
+ */
+export class CUpdateMasternode extends ComposableBuffer<UpdateMasternode> {
+  static OP_CODE = 0x6D // 'm'
+  static OP_NAME = 'OP_DEFI_TX_UPDATE_MASTER_NODE'
+
+  composers (cmn: UpdateMasternode): BufferComposer[] {
+    return [
+      ComposableBuffer.hexBEBufferLE(32, () => cmn.nodeId, v => cmn.nodeId = v)
+
+    ]
+  }
+}

From 9fa64e0a213176196f8af2ea9cb6b9b5f8779a7b Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Fri, 18 Nov 2022 14:16:36 +0800
Subject: [PATCH 02/31] Add mapping

---
 packages/jellyfish-transaction/src/script/mapping.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/jellyfish-transaction/src/script/mapping.ts b/packages/jellyfish-transaction/src/script/mapping.ts
index 0761d967c4..4364515020 100644
--- a/packages/jellyfish-transaction/src/script/mapping.ts
+++ b/packages/jellyfish-transaction/src/script/mapping.ts
@@ -123,7 +123,7 @@ import {
   CICXClaimDFCHTLC,
   ICXClaimDFCHTLC
 } from './dftx/dftx_icxorderbook'
-import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode } from './dftx/dftx_masternode'
+import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode, UpdateMasternode } from './dftx/dftx_masternode'
 
 /**
  * @param num to map as OPCode, 1 byte long
@@ -389,6 +389,14 @@ export const OP_CODES = {
       data: resignMasternode
     })
   },
+  OP_DEFI_TX_UPDATE_MASTER_NODE: (updateMasternode: UpdateMasternode): OP_DEFI_TX => {
+    return new OP_DEFI_TX({
+      signature: CDfTx.SIGNATURE,
+      type: CCreateMasternode.OP_CODE,
+      name: CCreateMasternode.OP_NAME,
+      data: updateMasternode
+    })
+  },
   OP_DEFI_TX_SET_GOVERNANCE: (setGovernance: SetGovernance) => {
     return new OP_DEFI_TX({
       signature: CDfTx.SIGNATURE,

From 0ed853b6b3fea3bfa4d2e5d907ad36e432855d7b Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Sat, 19 Nov 2022 23:01:49 +0800
Subject: [PATCH 03/31] WIP

---
 .../src/script/dftx/dftx.ts                   |  4 +--
 .../src/script/dftx/dftx_masternode.ts        | 29 +++++++++++++++----
 .../src/script/mapping.ts                     |  6 ++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx.ts b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
index bb171187fb..dfd46a8982 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
@@ -12,7 +12,7 @@ import {
   CUtxosToAccount,
   CSetFutureSwap
 } from './dftx_account'
-import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode } from './dftx_masternode'
+import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode, CUpdateMasternode, UpdateMasternode } from './dftx_masternode'
 import { CAutoAuthPrep } from './dftx_misc'
 import {
   CPoolAddLiquidity,
@@ -226,7 +226,7 @@ export class CDfTx extends ComposableBuffer<DfTx<any>> {
       case CCreateMasternode.OP_CODE:
         return compose<CreateMasternode>(CCreateMasternode.OP_NAME, d => new CCreateMasternode(d))
       case CUpdateMasternode.OP_CODE:
-        return compose<CreateMasternode>(CUpdateMasternode.OP_NAME, d => new CUpdateMasternode(d))
+        return compose<UpdateMasternode>(CUpdateMasternode.OP_NAME, d => new CUpdateMasternode(d))
       case CResignMasternode.OP_CODE:
         return compose<ResignMasternode>(CResignMasternode.OP_NAME, d => new CResignMasternode(d))
       case CSetGovernance.OP_CODE:
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 8980d2010c..b8997baadc 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -1,5 +1,7 @@
 import { SmartBuffer } from 'smart-buffer'
 import { BufferComposer, ComposableBuffer } from '@defichain/jellyfish-buffer'
+import { Script } from '../../tx'
+import { CScript } from '../../tx_composer'
 
 /**
  * CreateMasternode DeFi Transaction
@@ -63,9 +65,16 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
 /**
  * UpdateMasternode DeFi Transaction
  */
+// export interface UpdateMasternodeValues {
+//   ownerAddress?: string
+//   operatorAddress?: string
+//   rewardAddress?: string
+// }
 export interface UpdateMasternode {
   nodeId: string // --------------------------------| VarUInt{32 bytes}
-  // updates:
+  ownerAddress?: Script
+  operatorAddress?: Script
+  rewardAddress?: Script
 }
 
 /**
@@ -76,10 +85,20 @@ export class CUpdateMasternode extends ComposableBuffer<UpdateMasternode> {
   static OP_CODE = 0x6D // 'm'
   static OP_NAME = 'OP_DEFI_TX_UPDATE_MASTER_NODE'
 
-  composers (cmn: UpdateMasternode): BufferComposer[] {
-    return [
-      ComposableBuffer.hexBEBufferLE(32, () => cmn.nodeId, v => cmn.nodeId = v)
-
+  composers (umn: UpdateMasternode): BufferComposer[] {
+    let { ownerAddress, operatorAddress, rewardAddress } = umn
+    const bufferComposer = [
+      ComposableBuffer.hexBEBufferLE(32, () => umn.nodeId, v => umn.nodeId = v)
     ]
+    if (typeof ownerAddress !== 'undefined') {
+      bufferComposer.push(ComposableBuffer.single<Script>(() => ownerAddress as Script, v => ownerAddress = v, v => new CScript(v)))
+    }
+    if (typeof ownerAddress !== 'undefined') {
+      bufferComposer.push(ComposableBuffer.single<Script>(() => operatorAddress as Script, v => operatorAddress = v, v => new CScript(v)))
+    }
+    if (typeof ownerAddress !== 'undefined') {
+      bufferComposer.push(ComposableBuffer.single<Script>(() => rewardAddress as Script, v => rewardAddress = v, v => new CScript(v)))
+    }
+    return bufferComposer
   }
 }
diff --git a/packages/jellyfish-transaction/src/script/mapping.ts b/packages/jellyfish-transaction/src/script/mapping.ts
index 4364515020..e029beaa5e 100644
--- a/packages/jellyfish-transaction/src/script/mapping.ts
+++ b/packages/jellyfish-transaction/src/script/mapping.ts
@@ -123,7 +123,7 @@ import {
   CICXClaimDFCHTLC,
   ICXClaimDFCHTLC
 } from './dftx/dftx_icxorderbook'
-import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode, UpdateMasternode } from './dftx/dftx_masternode'
+import { CCreateMasternode, CreateMasternode, CResignMasternode, CUpdateMasternode, ResignMasternode, UpdateMasternode } from './dftx/dftx_masternode'
 
 /**
  * @param num to map as OPCode, 1 byte long
@@ -392,8 +392,8 @@ export const OP_CODES = {
   OP_DEFI_TX_UPDATE_MASTER_NODE: (updateMasternode: UpdateMasternode): OP_DEFI_TX => {
     return new OP_DEFI_TX({
       signature: CDfTx.SIGNATURE,
-      type: CCreateMasternode.OP_CODE,
-      name: CCreateMasternode.OP_NAME,
+      type: CUpdateMasternode.OP_CODE,
+      name: CUpdateMasternode.OP_NAME,
       data: updateMasternode
     })
   },

From 30a9b3a4df004ee4ce4cbf0ca52b2f8638e1c1f6 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Mon, 21 Nov 2022 00:16:13 +0800
Subject: [PATCH 04/31] Resolve conflict

---
 .../src/script/dftx/dftx.ts                   |  9 ++-
 .../src/script/dftx/dftx_masternode.ts        | 58 +++++++++++++------
 .../src/script/mapping.ts                     |  9 ++-
 3 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx.ts b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
index dfd46a8982..7e22943170 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx.ts
@@ -12,7 +12,14 @@ import {
   CUtxosToAccount,
   CSetFutureSwap
 } from './dftx_account'
-import { CCreateMasternode, CreateMasternode, CResignMasternode, ResignMasternode, CUpdateMasternode, UpdateMasternode } from './dftx_masternode'
+import {
+  CCreateMasternode,
+  CreateMasternode,
+  CResignMasternode,
+  ResignMasternode,
+  CUpdateMasternode,
+  UpdateMasternode
+} from './dftx_masternode'
 import { CAutoAuthPrep } from './dftx_misc'
 import {
   CPoolAddLiquidity,
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index b8997baadc..6a6cd76961 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -1,7 +1,5 @@
 import { SmartBuffer } from 'smart-buffer'
 import { BufferComposer, ComposableBuffer } from '@defichain/jellyfish-buffer'
-import { Script } from '../../tx'
-import { CScript } from '../../tx_composer'
 
 /**
  * CreateMasternode DeFi Transaction
@@ -62,6 +60,42 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
   }
 }
 
+export interface UpdateMasternodeAddress {
+  addressType: number // --------------------------| 1 byte, 0x01 = p2pkh, 0x04 = p2wpkh
+  addressPubKeyHash: string // -------------------| VarUInt{20 bytes}
+}
+
+/**
+ * Composable TokenBalance, C stands for Composable.
+ * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
+ */
+export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeAddress> {
+  composers (umn: UpdateMasternodeAddress): BufferComposer[] {
+    return [
+      ComposableBuffer.uInt8(() => umn.addressType, v => umn.addressType = v),
+      ComposableBuffer.hex(20, () => umn.addressPubKeyHash, v => umn.addressPubKeyHash = v)
+    ]
+  }
+}
+
+interface UpdateMasternodeData {
+  updateType: number // ----| 1 byte, 0x01 = OwnerAddress, 0x02 = OperatorAddress, 0x03 = SetRewardAddress, 0x04 = RemRewardAddress
+  address: UpdateMasternodeAddress[] // -------------------| [] for RemRewardAddress
+}
+
+/**
+ * Composable TokenBalance, C stands for Composable.
+ * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
+ */
+export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData> {
+  composers (umn: UpdateMasternodeData): BufferComposer[] {
+    return [
+      ComposableBuffer.uInt8(() => umn.updateType, v => umn.updateType = v),
+      ComposableBuffer.compactSizeArray(() => umn.address, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
+    ]
+  }
+}
+
 /**
  * UpdateMasternode DeFi Transaction
  */
@@ -72,9 +106,7 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
 // }
 export interface UpdateMasternode {
   nodeId: string // --------------------------------| VarUInt{32 bytes}
-  ownerAddress?: Script
-  operatorAddress?: Script
-  rewardAddress?: Script
+  updates: UpdateMasternodeData[]
 }
 
 /**
@@ -86,19 +118,9 @@ export class CUpdateMasternode extends ComposableBuffer<UpdateMasternode> {
   static OP_NAME = 'OP_DEFI_TX_UPDATE_MASTER_NODE'
 
   composers (umn: UpdateMasternode): BufferComposer[] {
-    let { ownerAddress, operatorAddress, rewardAddress } = umn
-    const bufferComposer = [
-      ComposableBuffer.hexBEBufferLE(32, () => umn.nodeId, v => umn.nodeId = v)
+    return [
+      ComposableBuffer.hexBEBufferLE(32, () => umn.nodeId, v => umn.nodeId = v),
+      ComposableBuffer.compactSizeArray(() => umn.updates, v => umn.updates = v, v => new CUpdateMasternodeData(v))
     ]
-    if (typeof ownerAddress !== 'undefined') {
-      bufferComposer.push(ComposableBuffer.single<Script>(() => ownerAddress as Script, v => ownerAddress = v, v => new CScript(v)))
-    }
-    if (typeof ownerAddress !== 'undefined') {
-      bufferComposer.push(ComposableBuffer.single<Script>(() => operatorAddress as Script, v => operatorAddress = v, v => new CScript(v)))
-    }
-    if (typeof ownerAddress !== 'undefined') {
-      bufferComposer.push(ComposableBuffer.single<Script>(() => rewardAddress as Script, v => rewardAddress = v, v => new CScript(v)))
-    }
-    return bufferComposer
   }
 }
diff --git a/packages/jellyfish-transaction/src/script/mapping.ts b/packages/jellyfish-transaction/src/script/mapping.ts
index e029beaa5e..1e6d707780 100644
--- a/packages/jellyfish-transaction/src/script/mapping.ts
+++ b/packages/jellyfish-transaction/src/script/mapping.ts
@@ -123,7 +123,14 @@ import {
   CICXClaimDFCHTLC,
   ICXClaimDFCHTLC
 } from './dftx/dftx_icxorderbook'
-import { CCreateMasternode, CreateMasternode, CResignMasternode, CUpdateMasternode, ResignMasternode, UpdateMasternode } from './dftx/dftx_masternode'
+import {
+  CCreateMasternode,
+  CreateMasternode,
+  CResignMasternode,
+  ResignMasternode,
+  CUpdateMasternode,
+  UpdateMasternode
+} from './dftx/dftx_masternode'
 
 /**
  * @param num to map as OPCode, 1 byte long

From 5b8b3bc8be8d0fc0e9f56d00d7080b48f674df7d Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Mon, 21 Nov 2022 17:42:59 +0800
Subject: [PATCH 05/31] Update image version

---
 apps/rich-list-api/docker-compose.yml                          | 3 ++-
 apps/whale-api/docker-compose.yml                              | 3 ++-
 packages/testcontainers/src/containers/DeFiDContainer.ts       | 2 +-
 .../testcontainers/src/containers/RegTestContainer/index.ts    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/rich-list-api/docker-compose.yml b/apps/rich-list-api/docker-compose.yml
index d7e556c4f2..ec17eefeca 100644
--- 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:HEAD-49fba65ce
+    image: defi/defichain:master-fff6b7794
     ports:
       - "19554:19554"
     command: >
@@ -47,4 +47,5 @@ services:
       -fortcanningspringheight=13
       -fortcanninggreatworldheight=14
       -fortcanningepilogueheight=15
+      -grandcentralheight=16
       -regtest-skip-loan-collateral-validation
diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml
index 57c6151e88..1da182de21 100644
--- 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:HEAD-49fba65ce
+    image: defi/defichain:master-fff6b7794
     ports:
       - "19554:19554"
     command: >
@@ -36,6 +36,7 @@ services:
       -fortcanningspringheight=13
       -fortcanninggreatworldheight=14
       -fortcanningepilogueheight=15
+      -grandcentralheight=16
       -regtest-skip-loan-collateral-validation
 
   defi-whale:
diff --git a/packages/testcontainers/src/containers/DeFiDContainer.ts b/packages/testcontainers/src/containers/DeFiDContainer.ts
index a7eca2268c..f377dee2d5 100644
--- a/packages/testcontainers/src/containers/DeFiDContainer.ts
+++ b/packages/testcontainers/src/containers/DeFiDContainer.ts
@@ -35,7 +35,7 @@ export abstract class DeFiDContainer extends DockerContainer {
     if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
       return process.env.DEFICHAIN_DOCKER_IMAGE
     }
-    return 'defi/defichain:HEAD-49fba65ce'
+    return 'defi/defichain:master-fff6b7794'
   }
 
   public static readonly DefaultStartOptions = {
diff --git a/packages/testcontainers/src/containers/RegTestContainer/index.ts b/packages/testcontainers/src/containers/RegTestContainer/index.ts
index 1d9daaccbf..9ac383eb79 100644
--- a/packages/testcontainers/src/containers/RegTestContainer/index.ts
+++ b/packages/testcontainers/src/containers/RegTestContainer/index.ts
@@ -40,6 +40,7 @@ export class RegTestContainer extends DeFiDContainer {
       '-fortcanningspringheight=13',
       '-fortcanninggreatworldheight=14',
       '-fortcanningepilogueheight=15',
+      '-grandcentralheight=16',
       '-regtest-skip-loan-collateral-validation'
     ]
 

From e6481016049d21a06055a0a79d87853751c99b80 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Mon, 21 Nov 2022 17:43:59 +0800
Subject: [PATCH 06/31] Remove redundant code

---
 .../src/script/dftx/dftx_masternode.ts                     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 6a6cd76961..d19247b9b0 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -99,11 +99,6 @@ export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData
 /**
  * UpdateMasternode DeFi Transaction
  */
-// export interface UpdateMasternodeValues {
-//   ownerAddress?: string
-//   operatorAddress?: string
-//   rewardAddress?: string
-// }
 export interface UpdateMasternode {
   nodeId: string // --------------------------------| VarUInt{32 bytes}
   updates: UpdateMasternodeData[]
@@ -114,7 +109,7 @@ export interface UpdateMasternode {
  * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
  */
 export class CUpdateMasternode extends ComposableBuffer<UpdateMasternode> {
-  static OP_CODE = 0x6D // 'm'
+  static OP_CODE = 0x6d // 'm'
   static OP_NAME = 'OP_DEFI_TX_UPDATE_MASTER_NODE'
 
   composers (umn: UpdateMasternode): BufferComposer[] {

From 68674ddc0436720ee259490158f4e95696fcf0c1 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Mon, 21 Nov 2022 17:47:01 +0800
Subject: [PATCH 07/31] Add transaction builder tests (WIP)

---
 .../txn/txn_builder_masternode_update.test.ts | 85 +++++++++++++++++++
 .../src/txn/txn_builder_masternode.ts         | 17 +++-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
new file mode 100644
index 0000000000..e527806b0f
--- /dev/null
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -0,0 +1,85 @@
+import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
+import { RegTest } from '@defichain/jellyfish-network'
+import { OP_CODES, TransactionSegWit, UpdateMasternode } from '@defichain/jellyfish-transaction'
+import { P2WPKH } from '@defichain/jellyfish-address'
+import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
+import { getProviders, MockProviders } from '../provider.mock'
+import { P2WPKHTransactionBuilder } from '../../src'
+import { fundEllipticPair, sendTransaction } from '../test.utils'
+import { Bech32 } from '@defichain/jellyfish-crypto'
+
+describe('UpdateMasternode', () => {
+  const container = new MasterNodeRegTestContainer()
+  let providers: MockProviders
+  let builder: P2WPKHTransactionBuilder
+  let jsonRpc: JsonRpcClient
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+    await container.waitForWalletCoinbaseMaturity()
+    await container.waitForWalletBalanceGTE(1001)
+
+    jsonRpc = new JsonRpcClient(await container.getCachedRpcUrl())
+    providers = await getProviders(container)
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  beforeEach(async () => {
+    await providers.randomizeEllipticPair()
+    builder = new P2WPKHTransactionBuilder(providers.fee, providers.prevout, providers.elliptic, RegTest)
+    await fundEllipticPair(container, providers.ellipticPair, 10)
+    await providers.setupMocks()
+  })
+
+  it('should update operator address with P2WPKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(30)
+
+    const address2 = await container.getNewAddress('', 'bech32')
+    const addressDest2: P2WPKH = P2WPKH.fromAddress(RegTest, address2, P2WPKH)
+    const addressDestHex2 = addressDest2.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x02,
+          address: [{ addressType: 0x01, addressPubKeyHash: addressDestHex2 }]
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6d${encoded}`
+
+    const outs = await sendTransaction(container, txn)
+    console.log(outs, expectedRedeemScript)
+    // expect(outs.length).toStrictEqual(2)
+    // expect(outs[0].value).toStrictEqual(1)
+    // expect(outs[0].n).toStrictEqual(0)
+    // expect(outs[0].tokenId).toStrictEqual(0)
+    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 4466547843')).toBeTruthy()
+    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    // expect(outs[1].value).toStrictEqual(2)
+    // expect(outs[1].n).toStrictEqual(1)
+    // expect(outs[1].tokenId).toStrictEqual(0)
+    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+
+    await container.generate(1)
+  })
+})
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index b689cc758f..fa7a6f017b 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -4,7 +4,8 @@ import {
   OP_CODES,
   ResignMasternode,
   Script,
-  TransactionSegWit
+  TransactionSegWit,
+  UpdateMasternode
 } from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 
@@ -41,4 +42,18 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
       changeScript
     )
   }
+
+  /**
+   * Build update masternode transaction
+   *
+   * @param {UpdateMasternode} updateMasternode transaction to create
+   * @param {Script} changeScript to send unspent to after deducting the (converted + fees)
+   * @return {Promise<TransactionSegWit>}
+   */
+  async update (updateMasternode: UpdateMasternode, changeScript: Script): Promise<TransactionSegWit> {
+    return await this.createDeFiTx(
+      OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
+      changeScript
+    )
+  }
 }

From 67d6e5e65855651b35b7eccef78091c350eb99fb Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Mon, 21 Nov 2022 18:15:20 +0800
Subject: [PATCH 08/31] Fix format

---
 .../__tests__/txn/txn_builder_masternode_update.test.ts       | 2 +-
 .../jellyfish-transaction/src/script/dftx/dftx_masternode.ts  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index e527806b0f..8e11a0b663 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -53,7 +53,7 @@ describe('UpdateMasternode', () => {
       updates: [
         {
           updateType: 0x02,
-          address: [{ addressType: 0x01, addressPubKeyHash: addressDestHex2 }]
+          address: { addressType: 0x01, addressPubKeyHash: addressDestHex2 }
         }
       ]
     }
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index d19247b9b0..3d7fcb635b 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -80,7 +80,7 @@ export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeA
 
 interface UpdateMasternodeData {
   updateType: number // ----| 1 byte, 0x01 = OwnerAddress, 0x02 = OperatorAddress, 0x03 = SetRewardAddress, 0x04 = RemRewardAddress
-  address: UpdateMasternodeAddress[] // -------------------| [] for RemRewardAddress
+  address: UpdateMasternodeAddress
 }
 
 /**
@@ -91,7 +91,7 @@ export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData
   composers (umn: UpdateMasternodeData): BufferComposer[] {
     return [
       ComposableBuffer.uInt8(() => umn.updateType, v => umn.updateType = v),
-      ComposableBuffer.compactSizeArray(() => umn.address, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
+      ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
     ]
   }
 }

From 642b411937b26a994488bf0b64d3d1fd2f89ea7b Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 03:16:41 +0800
Subject: [PATCH 09/31] Fix format bug

---
 .../jellyfish-transaction/src/script/dftx/dftx_masternode.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 3d7fcb635b..282c3c8a98 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -62,7 +62,7 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
 
 export interface UpdateMasternodeAddress {
   addressType: number // --------------------------| 1 byte, 0x01 = p2pkh, 0x04 = p2wpkh
-  addressPubKeyHash: string // -------------------| VarUInt{20 bytes}
+  addressPubKeyHash?: string // -------------------| VarUInt{20 bytes}
 }
 
 /**
@@ -73,7 +73,7 @@ export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeA
   composers (umn: UpdateMasternodeAddress): BufferComposer[] {
     return [
       ComposableBuffer.uInt8(() => umn.addressType, v => umn.addressType = v),
-      ComposableBuffer.hex(20, () => umn.addressPubKeyHash, v => umn.addressPubKeyHash = v)
+      ComposableBuffer.compactSizeOptionalHex(() => umn.addressPubKeyHash, v => umn.addressPubKeyHash = v)
     ]
   }
 }

From e4a9e878a697d59b1551d3a91cf416ead4050663 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 03:19:04 +0800
Subject: [PATCH 10/31] Add tests for updating operator and reward address

---
 .../txn/txn_builder_masternode_update.test.ts | 104 ++++++++++++++----
 1 file changed, 83 insertions(+), 21 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 8e11a0b663..5c3d4807dd 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -39,21 +39,31 @@ describe('UpdateMasternode', () => {
     const balance = await container.call('getbalance')
     expect(balance >= 2).toBeTruthy()
 
+    // enable updating
+    await jsonRpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/mn-setowneraddress': 'true',
+        'v0/params/feature/mn-setoperatoraddress': 'true',
+        'v0/params/feature/mn-setrewardaddress': 'true'
+      }
+    })
+    await container.generate(1)
+
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(30)
+    await container.generate(20)
 
-    const address2 = await container.getNewAddress('', 'bech32')
-    const addressDest2: P2WPKH = P2WPKH.fromAddress(RegTest, address2, P2WPKH)
-    const addressDestHex2 = addressDest2.pubKeyHash
+    const address = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
+    const addressDestHex = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
       nodeId: txid,
       updates: [
         {
           updateType: 0x02,
-          address: { addressType: 0x01, addressPubKeyHash: addressDestHex2 }
+          address: { addressType: 0x04, addressPubKeyHash: addressDestHex }
         }
       ]
     }
@@ -61,25 +71,77 @@ describe('UpdateMasternode', () => {
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
     const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6d${encoded}`
+    const expectedRedeemScript = `6a${encoded}`
 
     const outs = await sendTransaction(container, txn)
-    console.log(outs, expectedRedeemScript)
-    // expect(outs.length).toStrictEqual(2)
-    // expect(outs[0].value).toStrictEqual(1)
-    // expect(outs[0].n).toStrictEqual(0)
-    // expect(outs[0].tokenId).toStrictEqual(0)
-    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 4466547843')).toBeTruthy()
-    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
-
-    // expect(outs[1].value).toStrictEqual(2)
-    // expect(outs[1].n).toStrictEqual(1)
-    // expect(outs[1].tokenId).toStrictEqual(0)
-    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toStrictEqual(6.9999542)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+  })
+
+  it('should update reward address with P2WPKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
 
+    // enable updating
+    await jsonRpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/mn-setowneraddress': 'true',
+        'v0/params/feature/mn-setoperatoraddress': 'true',
+        'v0/params/feature/mn-setrewardaddress': 'true'
+      }
+    })
     await container.generate(1)
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const address = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
+    const addressDestHex = addressDest.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x03,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestHex }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
+    const outs = await sendTransaction(container, txn)
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toStrictEqual(6.9999542)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 })

From 78104495918926f7b97e2300b1d59613308ade50 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 11:50:28 +0800
Subject: [PATCH 11/31] Add tests

---
 .../txn/txn_builder_masternode_update.test.ts | 256 ++++++++++++++++--
 1 file changed, 231 insertions(+), 25 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 5c3d4807dd..ea0d79a65d 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,7 +1,7 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
 import { OP_CODES, TransactionSegWit, UpdateMasternode } from '@defichain/jellyfish-transaction'
-import { P2WPKH } from '@defichain/jellyfish-address'
+import { P2PKH, P2WPKH } from '@defichain/jellyfish-address'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
 import { P2WPKHTransactionBuilder } from '../../src'
@@ -16,9 +16,8 @@ describe('UpdateMasternode', () => {
 
   beforeAll(async () => {
     await container.start()
-    await container.waitForReady()
     await container.waitForWalletCoinbaseMaturity()
-    await container.waitForWalletBalanceGTE(1001)
+    await container.waitForWalletBalanceGTE(1000)
 
     jsonRpc = new JsonRpcClient(await container.getCachedRpcUrl())
     providers = await getProviders(container)
@@ -33,11 +32,6 @@ describe('UpdateMasternode', () => {
     builder = new P2WPKHTransactionBuilder(providers.fee, providers.prevout, providers.elliptic, RegTest)
     await fundEllipticPair(container, providers.ellipticPair, 10)
     await providers.setupMocks()
-  })
-
-  it('should update operator address with P2WPKH address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
 
     // enable updating
     await jsonRpc.masternode.setGov({
@@ -48,6 +42,12 @@ describe('UpdateMasternode', () => {
       }
     })
     await container.generate(1)
+  })
+
+  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
+  it.skip('should update owner address with P2WPKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
 
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
@@ -56,24 +56,71 @@ describe('UpdateMasternode', () => {
 
     const address = await container.getNewAddress('', 'bech32')
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestHex = addressDest.pubKeyHash
+    const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
       nodeId: txid,
       updates: [
         {
-          updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestHex }
+          updateType: 0x01,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
         }
       ]
     }
 
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const outs = await sendTransaction(container, txn)
+
     const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
     const expectedRedeemScript = `6a${encoded}`
 
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+  })
+
+  it('should update operator address with P2WPKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const address = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
+    const addressDestKeyHash = addressDest.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x02,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
     const outs = await sendTransaction(container, txn)
+
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
     expect(outs.length).toStrictEqual(2)
     expect(outs[0].value).toStrictEqual(0)
     expect(outs[0].n).toStrictEqual(0)
@@ -82,7 +129,7 @@ describe('UpdateMasternode', () => {
     expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
     expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toStrictEqual(6.9999542)
+    expect(outs[1].value).toBeGreaterThan(6)
     expect(outs[1].n).toStrictEqual(1)
     expect(outs[1].tokenId).toStrictEqual(0)
     expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
@@ -94,16 +141,6 @@ describe('UpdateMasternode', () => {
     const balance = await container.call('getbalance')
     expect(balance >= 2).toBeTruthy()
 
-    // enable updating
-    await jsonRpc.masternode.setGov({
-      ATTRIBUTES: {
-        'v0/params/feature/mn-setowneraddress': 'true',
-        'v0/params/feature/mn-setoperatoraddress': 'true',
-        'v0/params/feature/mn-setrewardaddress': 'true'
-      }
-    })
-    await container.generate(1)
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -111,24 +148,133 @@ describe('UpdateMasternode', () => {
 
     const address = await container.getNewAddress('', 'bech32')
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestHex = addressDest.pubKeyHash
+    const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
       nodeId: txid,
       updates: [
         {
           updateType: 0x03,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestHex }
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
         }
       ]
     }
 
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const outs = await sendTransaction(container, txn)
+
     const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
     const expectedRedeemScript = `6a${encoded}`
 
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+  })
+
+  it('should update multiple addresses with P2WPKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const operatorAddress = await container.getNewAddress('', 'bech32')
+    const operatorAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress, P2WPKH)
+    const operatorAddressDestKeyHash = operatorAddressDest.pubKeyHash
+
+    const rewardAddress = await container.getNewAddress('', 'bech32')
+    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
+    const rewardAddressDestKeyHash = rewardAddressDest.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x02,
+          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash }
+        },
+        {
+          updateType: 0x03,
+          address: { addressType: 0x04, addressPubKeyHash: rewardAddressDestKeyHash }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const outs = await sendTransaction(container, txn)
+
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+  })
+
+  it('should update multiple address with P2PKH address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const operatorAddress = await container.getNewAddress('', 'legacy')
+    const operatorAddressDest: P2PKH = P2PKH.fromAddress(RegTest, operatorAddress, P2PKH)
+    const operatorAddressDestHex = operatorAddressDest.hex
+
+    const rewardAddress = await container.getNewAddress('', 'bech32')
+    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
+    const rewardAddressDestHex = rewardAddressDest.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x02,
+          address: { addressType: 0x01, addressPubKeyHash: operatorAddressDestHex }
+        },
+        {
+          updateType: 0x03,
+          address: { addressType: 0x01, addressPubKeyHash: rewardAddressDestHex }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
     const outs = await sendTransaction(container, txn)
+
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
     expect(outs.length).toStrictEqual(2)
     expect(outs[0].value).toStrictEqual(0)
     expect(outs[0].n).toStrictEqual(0)
@@ -137,11 +283,71 @@ describe('UpdateMasternode', () => {
     expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
     expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toStrictEqual(6.9999542)
+    expect(outs[1].value).toBeGreaterThan(6)
     expect(outs[1].n).toStrictEqual(1)
     expect(outs[1].tokenId).toStrictEqual(0)
     expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
     expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
     expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
+
+  it('should update remove reward address', async () => {
+    const balance = await container.call('getbalance')
+    expect(balance >= 2).toBeTruthy()
+
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const rewardAddress = await container.getNewAddress('', 'bech32')
+    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
+    const rewardAddressDestKeyHash = rewardAddressDest.pubKeyHash
+
+    const setRewardAddressUpdate: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x03,
+          address: { addressType: 0x04, addressPubKeyHash: rewardAddressDestKeyHash }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const setRewardTxn: TransactionSegWit = await builder.masternode.update(setRewardAddressUpdate, script)
+    await sendTransaction(container, setRewardTxn)
+
+    // WIP
+
+    // const updateMasternode: UpdateMasternode = {
+    //   nodeId: txid,
+    //   updates: [
+    //     {
+    //       updateType: 0x04,
+    //     }
+    //   ]
+    // }
+
+    // const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    // const outs = await sendTransaction(container, txn)
+
+    // const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    // const expectedRedeemScript = `6a${encoded}`
+
+    // expect(outs.length).toStrictEqual(2)
+    // expect(outs[0].value).toStrictEqual(0)
+    // expect(outs[0].n).toStrictEqual(0)
+    // expect(outs[0].tokenId).toStrictEqual(0)
+    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    // expect(outs[1].value).toBeGreaterThan(6)
+    // expect(outs[1].n).toStrictEqual(1)
+    // expect(outs[1].tokenId).toStrictEqual(0)
+    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+  })
 })

From c7f541fc57da48af3d1cf093334b2fed7b20dbd1 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 15:04:11 +0800
Subject: [PATCH 12/31] Update test and dftx for removing reward address

---
 .../txn/txn_builder_masternode_update.test.ts | 62 +++++++++----------
 .../src/script/dftx/dftx_masternode.ts        | 20 +++++-
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index ea0d79a65d..cbaa8ba2c3 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -318,36 +318,36 @@ describe('UpdateMasternode', () => {
     const setRewardTxn: TransactionSegWit = await builder.masternode.update(setRewardAddressUpdate, script)
     await sendTransaction(container, setRewardTxn)
 
-    // WIP
-
-    // const updateMasternode: UpdateMasternode = {
-    //   nodeId: txid,
-    //   updates: [
-    //     {
-    //       updateType: 0x04,
-    //     }
-    //   ]
-    // }
-
-    // const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    // const outs = await sendTransaction(container, txn)
-
-    // const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    // const expectedRedeemScript = `6a${encoded}`
-
-    // expect(outs.length).toStrictEqual(2)
-    // expect(outs[0].value).toStrictEqual(0)
-    // expect(outs[0].n).toStrictEqual(0)
-    // expect(outs[0].tokenId).toStrictEqual(0)
-    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
-
-    // expect(outs[1].value).toBeGreaterThan(6)
-    // expect(outs[1].n).toStrictEqual(1)
-    // expect(outs[1].tokenId).toStrictEqual(0)
-    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    await container.generate(50)
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x04
+        }
+      ]
+    }
+
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const outs = await sendTransaction(container, txn)
+
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
+    expect(outs.length).toStrictEqual(2)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 })
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 282c3c8a98..f2b68fc476 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -80,7 +80,7 @@ export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeA
 
 interface UpdateMasternodeData {
   updateType: number // ----| 1 byte, 0x01 = OwnerAddress, 0x02 = OperatorAddress, 0x03 = SetRewardAddress, 0x04 = RemRewardAddress
-  address: UpdateMasternodeAddress
+  address?: UpdateMasternodeAddress // -------------------| set undefined if updateType is 0x04 = RemRewardAddress
 }
 
 /**
@@ -89,9 +89,25 @@ interface UpdateMasternodeData {
  */
 export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData> {
   composers (umn: UpdateMasternodeData): BufferComposer[] {
+    const addressBuffer = []
+    if (umn.address != null) {
+      addressBuffer.push(
+        ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address as UpdateMasternodeAddress, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
+      )
+    } else {
+      addressBuffer.push({
+        fromBuffer: (buffer: SmartBuffer): void => {
+          buffer.readUInt16LE(0x0000)
+        },
+        toBuffer: (buffer: SmartBuffer): void => {
+          buffer.writeUInt16LE(0x0000)
+        }
+      })
+    }
+
     return [
       ComposableBuffer.uInt8(() => umn.updateType, v => umn.updateType = v),
-      ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
+      ...addressBuffer
     ]
   }
 }

From da84f9c2155cf92fa4eabbc8a4ccbdc7f8bff53f Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 15:08:54 +0800
Subject: [PATCH 13/31] Minor edit

---
 .../jellyfish-transaction/src/script/dftx/dftx_masternode.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index f2b68fc476..f1e46d27e6 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -90,6 +90,7 @@ interface UpdateMasternodeData {
 export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData> {
   composers (umn: UpdateMasternodeData): BufferComposer[] {
     const addressBuffer = []
+
     if (umn.address != null) {
       addressBuffer.push(
         ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address as UpdateMasternodeAddress, v => umn.address = v, v => new CUpdateMasternodeAddress(v))

From 02e0cf4e33f72d8782c6715e5a03f3de4c6dcda2 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 15:27:39 +0800
Subject: [PATCH 14/31] Add tests for transaction builder

---
 .../txn/txn_builder_masternode_update.test.ts | 110 ++++++++++++++----
 1 file changed, 90 insertions(+), 20 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index cbaa8ba2c3..ce5d526587 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,8 +1,8 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
 import { OP_CODES, TransactionSegWit, UpdateMasternode } from '@defichain/jellyfish-transaction'
-import { P2PKH, P2WPKH } from '@defichain/jellyfish-address'
-import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
+import { P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
+import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
 import { P2WPKHTransactionBuilder } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
@@ -42,13 +42,13 @@ describe('UpdateMasternode', () => {
       }
     })
     await container.generate(1)
-  })
 
-  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
-  it.skip('should update owner address with P2WPKH address', async () => {
     const balance = await container.call('getbalance')
     expect(balance >= 2).toBeTruthy()
+  })
 
+  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
+  it.skip('should update owner address with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -92,9 +92,6 @@ describe('UpdateMasternode', () => {
   })
 
   it('should update operator address with P2WPKH address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -138,9 +135,6 @@ describe('UpdateMasternode', () => {
   })
 
   it('should update reward address with P2WPKH address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -184,9 +178,6 @@ describe('UpdateMasternode', () => {
   })
 
   it('should update multiple addresses with P2WPKH address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -238,9 +229,6 @@ describe('UpdateMasternode', () => {
   })
 
   it('should update multiple address with P2PKH address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -292,9 +280,6 @@ describe('UpdateMasternode', () => {
   })
 
   it('should update remove reward address', async () => {
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -350,4 +335,89 @@ describe('UpdateMasternode', () => {
     expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
     expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
+
+  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
+  it.skip('should be failed if owner address is P2SH', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const address = await container.getNewAddress('', 'p2sh-segwit')
+    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+    const addressDestHex = addressDest.hex
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x01,
+          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+
+    const promise = sendTransaction(container, txn)
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)', code: -26")
+  })
+
+  it('should be failed if operator address is P2SH', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const address = await container.getNewAddress('', 'p2sh-segwit')
+    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+    const addressDestHex = addressDest.hex
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x02,
+          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+
+    const promise = sendTransaction(container, txn)
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)', code: -26")
+  })
+
+  it('should be failed if reward address is P2SH', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(20)
+
+    const address = await container.getNewAddress('', 'p2sh-segwit')
+    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+    const addressDestHex = addressDest.hex
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: txid,
+      updates: [
+        {
+          updateType: 0x03,
+          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
+        }
+      ]
+    }
+
+    const script = await providers.elliptic.script()
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+
+    const promise = sendTransaction(container, txn)
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)', code: -26")
+  })
 })

From 8b9bc7a48d1be89e94c45b8b1f1ad7bbc3892fc6 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 15:54:18 +0800
Subject: [PATCH 15/31] Fix mistakes in comments

---
 .../jellyfish-transaction/src/script/dftx/dftx_masternode.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index f1e46d27e6..283455f77d 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -66,7 +66,7 @@ export interface UpdateMasternodeAddress {
 }
 
 /**
- * Composable TokenBalance, C stands for Composable.
+ * Composable UpdateMasternodeAddress, C stands for Composable.
  * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
  */
 export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeAddress> {
@@ -84,7 +84,7 @@ interface UpdateMasternodeData {
 }
 
 /**
- * Composable TokenBalance, C stands for Composable.
+ * Composable UpdateMasternodeData, C stands for Composable.
  * Immutable by design, bi-directional fromBuffer, toBuffer deep composer.
  */
 export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData> {

From 860c3739349d770f031cb85f124e044be6cdb078 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 17:51:43 +0800
Subject: [PATCH 16/31] Fix buggy code for UpdateMasternodeData

---
 .../txn/txn_builder_masternode_update.test.ts |  3 ++-
 .../src/script/dftx/dftx_masternode.ts        | 23 +++----------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index ce5d526587..c70d7e1932 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -309,7 +309,8 @@ describe('UpdateMasternode', () => {
       nodeId: txid,
       updates: [
         {
-          updateType: 0x04
+          updateType: 0x04,
+          address: { addressType: 0x00, addressPubKeyHash: undefined }
         }
       ]
     }
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 283455f77d..753d116339 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -61,7 +61,7 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
 }
 
 export interface UpdateMasternodeAddress {
-  addressType: number // --------------------------| 1 byte, 0x01 = p2pkh, 0x04 = p2wpkh
+  addressType: number // --------------------------| 1 byte, 0x01 = p2pkh, 0x04 = p2wpkh, 0x00 to remove reward address
   addressPubKeyHash?: string // -------------------| VarUInt{20 bytes}
 }
 
@@ -80,7 +80,7 @@ export class CUpdateMasternodeAddress extends ComposableBuffer<UpdateMasternodeA
 
 interface UpdateMasternodeData {
   updateType: number // ----| 1 byte, 0x01 = OwnerAddress, 0x02 = OperatorAddress, 0x03 = SetRewardAddress, 0x04 = RemRewardAddress
-  address?: UpdateMasternodeAddress // -------------------| set undefined if updateType is 0x04 = RemRewardAddress
+  address: UpdateMasternodeAddress
 }
 
 /**
@@ -89,26 +89,9 @@ interface UpdateMasternodeData {
  */
 export class CUpdateMasternodeData extends ComposableBuffer<UpdateMasternodeData> {
   composers (umn: UpdateMasternodeData): BufferComposer[] {
-    const addressBuffer = []
-
-    if (umn.address != null) {
-      addressBuffer.push(
-        ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address as UpdateMasternodeAddress, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
-      )
-    } else {
-      addressBuffer.push({
-        fromBuffer: (buffer: SmartBuffer): void => {
-          buffer.readUInt16LE(0x0000)
-        },
-        toBuffer: (buffer: SmartBuffer): void => {
-          buffer.writeUInt16LE(0x0000)
-        }
-      })
-    }
-
     return [
       ComposableBuffer.uInt8(() => umn.updateType, v => umn.updateType = v),
-      ...addressBuffer
+      ComposableBuffer.single<UpdateMasternodeAddress>(() => umn.address, v => umn.address = v, v => new CUpdateMasternodeAddress(v))
     ]
   }
 }

From b5c7fd719911f482f34411620c04f5a20c3c0b69 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 18:11:14 +0800
Subject: [PATCH 17/31] Minor changes

---
 .../__tests__/txn/txn_builder_masternode_update.test.ts         | 2 +-
 .../jellyfish-transaction/src/script/dftx/dftx_masternode.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index c70d7e1932..634f0650ec 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -310,7 +310,7 @@ describe('UpdateMasternode', () => {
       updates: [
         {
           updateType: 0x04,
-          address: { addressType: 0x00, addressPubKeyHash: undefined }
+          address: { addressType: 0x00 }
         }
       ]
     }
diff --git a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
index 753d116339..bde6998aa3 100644
--- a/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
+++ b/packages/jellyfish-transaction/src/script/dftx/dftx_masternode.ts
@@ -62,7 +62,7 @@ export class CResignMasternode extends ComposableBuffer<ResignMasternode> {
 
 export interface UpdateMasternodeAddress {
   addressType: number // --------------------------| 1 byte, 0x01 = p2pkh, 0x04 = p2wpkh, 0x00 to remove reward address
-  addressPubKeyHash?: string // -------------------| VarUInt{20 bytes}
+  addressPubKeyHash?: string // -------------------| VarUInt{20 bytes}, set undefined to remove reward address
 }
 
 /**

From 4fd412f965f08191d3a7e7af9fe59ab94258fbb9 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 22 Nov 2022 18:11:45 +0800
Subject: [PATCH 18/31] Add jellyfish transaction tests

---
 .../dftx_masternode/UpdateMasterNode.test.ts  | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 packages/jellyfish-transaction/__tests__/script/dftx/dftx_masternode/UpdateMasterNode.test.ts

diff --git a/packages/jellyfish-transaction/__tests__/script/dftx/dftx_masternode/UpdateMasterNode.test.ts b/packages/jellyfish-transaction/__tests__/script/dftx/dftx_masternode/UpdateMasterNode.test.ts
new file mode 100644
index 0000000000..51829aeeb9
--- /dev/null
+++ b/packages/jellyfish-transaction/__tests__/script/dftx/dftx_masternode/UpdateMasterNode.test.ts
@@ -0,0 +1,91 @@
+import { SmartBuffer } from 'smart-buffer'
+import { OP_DEFI_TX } from '../../../../src/script/dftx'
+import { OP_CODES } from '../../../../src'
+import { toBuffer, toOPCodes } from '../../../../src/script/_buffer'
+import { CUpdateMasternode, UpdateMasternode } from '../../../../src/script/dftx/dftx_masternode'
+
+it('should bi-directional buffer-object-buffer', () => {
+  const fixtures = [
+    // update owner address with p2wpkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010104141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update operator address with p2wpkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010204141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update reward address with p2wpkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010304141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update owner, operator and reward addresses with p2wpkh address
+    '6a4c6b446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd030104141db4d4d5e7d01091545e5573494b2fd1e91215d902041476e76cdb4de312861ce893f307e7e2bd40a8ac2d030414b188e161a83571c5acd9dd40b316796a47c606d1',
+    // update owner address with p2pkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010101141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update operator address with p2pkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010201141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update reward address with p2pkh address
+    '6a3d446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd010301141db4d4d5e7d01091545e5573494b2fd1e91215d9',
+    // update owner, operator and reward addresses with p2pkh address
+    '6a4c6b446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd030101141db4d4d5e7d01091545e5573494b2fd1e91215d902011476e76cdb4de312861ce893f307e7e2bd40a8ac2d030114b188e161a83571c5acd9dd40b316796a47c606d1',
+    // remove reward address
+    '6a29446654786d2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd01040000'
+  ]
+
+  fixtures.forEach(hex => {
+    const stack = toOPCodes(
+      SmartBuffer.fromBuffer(Buffer.from(hex, 'hex'))
+    )
+    const buffer = toBuffer(stack)
+    expect(buffer.toString('hex')).toStrictEqual(hex)
+    expect((stack[1] as OP_DEFI_TX).tx.type).toStrictEqual(0x6d)
+  })
+})
+
+describe('UpdateMasternode', () => {
+  const header = '6a4c54446654786d' // OP_RETURN(0x6a) OP_PUSHDATA1 (length 84 = 0x54) CDfTx.SIGNATURE(0x44665478) CUpdateMasternode.OP_CODE(0x6d)
+
+  const data = '2319bc7b76b6916d0b61ee7a408d47d33380be746d11a5702bd87bbee5f8d3bd020104141db4d4d5e7d01091545e5573494b2fd1e91215d902041476e76cdb4de312861ce893f307e7e2bd40a8ac2d'
+  // UpdateMasternode.nodeId [LE] (bdd3f8e5be7bd82b70a5116d74be8033d3478d407aee610b6d91b6767bbc1923)
+  // UpdateMasternode.updates [array length] (0x02)
+  // UpdateMasternodeData.updateType [OwnerAddress] (0x01)
+  // UpdateMasternodeAddress.addressType [p2wpkh] (0x04)
+  // UpdateMasternodeAddress.addressPubKeyHash (length 20 = 0x14) (1db4d4d5e7d01091545e5573494b2fd1e91215d9)
+  // UpdateMasternodeData.updateType [OperatorAddress] (0x02)
+  // UpdateMasternodeAddress.addressType [p2wpkh] (0x04)
+  // UpdateMasternodeAddress.addressPubKeyHash (length 20 = 0x14) (76e76cdb4de312861ce893f307e7e2bd40a8ac2d)
+
+  const updateMasternode: UpdateMasternode = {
+    nodeId: 'bdd3f8e5be7bd82b70a5116d74be8033d3478d407aee610b6d91b6767bbc1923',
+    updates: [
+      {
+        updateType: 0x01,
+        address: { addressType: 0x04, addressPubKeyHash: '1db4d4d5e7d01091545e5573494b2fd1e91215d9' }
+      },
+      {
+        updateType: 0x02,
+        address: { addressType: 0x04, addressPubKeyHash: '76e76cdb4de312861ce893f307e7e2bd40a8ac2d' }
+      }
+    ]
+  }
+
+  it('should craft dftx with OP_CODES._()', () => {
+    const stack = [
+      OP_CODES.OP_RETURN,
+      OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode)
+    ]
+
+    const buffer = toBuffer(stack)
+    expect(buffer.toString('hex')).toStrictEqual(header + data)
+  })
+
+  describe('Composable', () => {
+    it('should compose from buffer to composable', () => {
+      const buffer = SmartBuffer.fromBuffer(Buffer.from(data, 'hex'))
+      const composable = new CUpdateMasternode(buffer)
+      expect(composable.toObject()).toStrictEqual(updateMasternode)
+    })
+
+    it('should compose from composable to buffer', () => {
+      const composable = new CUpdateMasternode(updateMasternode)
+      const buffer = new SmartBuffer()
+      composable.toBuffer(buffer)
+
+      expect(buffer.toBuffer().toString('hex')).toStrictEqual(data)
+    })
+  })
+})

From bc161a9072eb1dae2ddac748f406e2e4bfabc2b6 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Thu, 24 Nov 2022 16:58:32 +0800
Subject: [PATCH 19/31] Update tests

---
 .../txn/txn_builder_masternode_update.test.ts | 150 +++++++++++++-----
 1 file changed, 108 insertions(+), 42 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 634f0650ec..0715cc1109 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -47,8 +47,8 @@ describe('UpdateMasternode', () => {
     expect(balance >= 2).toBeTruthy()
   })
 
-  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
-  it.skip('should update owner address with P2WPKH address', async () => {
+  // todo: need to fix
+  it('should update owner address with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -177,7 +177,7 @@ describe('UpdateMasternode', () => {
     expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
-  it('should update multiple addresses with P2WPKH address', async () => {
+  it('should update multiple addresses simultaneously with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -228,7 +228,7 @@ describe('UpdateMasternode', () => {
     expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
-  it('should update multiple address with P2PKH address', async () => {
+  it('should update multiple addresses simultaneously with P2PKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -238,9 +238,9 @@ describe('UpdateMasternode', () => {
     const operatorAddressDest: P2PKH = P2PKH.fromAddress(RegTest, operatorAddress, P2PKH)
     const operatorAddressDestHex = operatorAddressDest.hex
 
-    const rewardAddress = await container.getNewAddress('', 'bech32')
-    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
-    const rewardAddressDestHex = rewardAddressDest.pubKeyHash
+    const rewardAddress = await container.getNewAddress('', 'legacy')
+    const rewardAddressDest: P2PKH = P2PKH.fromAddress(RegTest, rewardAddress, P2PKH)
+    const rewardAddressDestHex = rewardAddressDest.hex
 
     const updateMasternode: UpdateMasternode = {
       nodeId: txid,
@@ -337,8 +337,7 @@ describe('UpdateMasternode', () => {
     expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
-  // todo: unskip after https://github.com/DeFiCh/ain/pull/1584 is in prerelease to use image
-  it.skip('should be failed if owner address is P2SH', async () => {
+  it('should fail if address is P2SH', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
@@ -348,77 +347,144 @@ describe('UpdateMasternode', () => {
     const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
     const addressDestHex = addressDest.hex
 
-    const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
-        }
-      ]
+    const script = await providers.elliptic.script()
+
+    // todo: need to fix
+    {
+      const updateMasternode: UpdateMasternode = {
+        nodeId: txid,
+        updates: [{ updateType: 0x01, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)', code: -26")
+    }
+    {
+      const updateMasternode: UpdateMasternode = {
+        nodeId: txid,
+        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)', code: -26")
     }
+    {
+      const updateMasternode: UpdateMasternode = {
+        nodeId: txid,
+        updates: [{ updateType: 0x03, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)', code: -26")
+    }
+  })
+
+  it('should be failed as invalid address is not allowed', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
+
+    await container.generate(20)
 
     const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
 
-    const promise = sendTransaction(container, txn)
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)', code: -26")
+    // todo: need to fix
+    {
+      const invalidAddress = 'INVALID_ADDRESS'
+      const updateMasternode: UpdateMasternode = {
+        nodeId: masternodeId,
+        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)\', code: -26')
+    }
+
+    {
+      const invalidAddress = 'INVALID_ADDRESS'
+      const updateMasternode: UpdateMasternode = {
+        nodeId: masternodeId,
+        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)\', code: -26')
+    }
+
+    {
+      const invalidAddress = 'INVALID_ADDRESS'
+      const updateMasternode: UpdateMasternode = {
+        nodeId: masternodeId,
+        updates: [{ updateType: 0x03, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
+      }
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)\', code: -26')
+    }
   })
 
-  it('should be failed if operator address is P2SH', async () => {
+  // todo: need to fix
+  it('should fail to update owner address with same address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
-    const address = await container.getNewAddress('', 'p2sh-segwit')
-    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-    const addressDestHex = addressDest.hex
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, collateralAddress, P2WPKH)
+    const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
       nodeId: txid,
       updates: [
         {
-          updateType: 0x02,
-          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
+          updateType: 0x01,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
         }
       ]
     }
 
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-
     const promise = sendTransaction(container, txn)
     await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)', code: -26")
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'Test UpdateMasternodeTx execution failed:\nMasternode with collateral address as operator or owner already exists', code: -32600, method: updatemasternode")
   })
 
-  it('should be failed if reward address is P2SH', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
+  it('should fail to update another node with operator address that is already used', async () => {
+    const pubKey1 = await providers.ellipticPair.publicKey()
+    const collateralAddress1 = Bech32.fromPubKey(pubKey1, 'bcrt')
+    await jsonRpc.masternode.createMasternode(collateralAddress1)
+    const addressDest1: P2WPKH = P2WPKH.fromAddress(RegTest, collateralAddress1, P2WPKH)
+    const addressDestKeyHash1 = addressDest1.pubKeyHash
 
-    const address = await container.getNewAddress('', 'p2sh-segwit')
-    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-    const addressDestHex = addressDest.hex
+    await providers.randomizeEllipticPair()
+    await providers.setupMocks()
+    const pubKey2 = await providers.ellipticPair.publicKey()
+    const collateralAddress2 = Bech32.fromPubKey(pubKey2, 'bcrt')
+    const masternodeId2 = await jsonRpc.masternode.createMasternode(collateralAddress2)
+
+    await container.generate(20)
 
     const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
+      nodeId: masternodeId2,
       updates: [
         {
-          updateType: 0x03,
-          address: { addressType: 0x02, addressPubKeyHash: addressDestHex }
+          updateType: 0x02,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash1 }
         }
       ]
     }
 
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-
     const promise = sendTransaction(container, txn)
     await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)', code: -26")
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode with that operator address already exists (code 16)', code: -26")
   })
 })

From 11c9e0583e6706374196fe8493e48f3c678cad96 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Fri, 25 Nov 2022 13:23:31 +0800
Subject: [PATCH 20/31] Add updatemasternode rpc

---
 .../src/category/masternode.ts                | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/jellyfish-api-core/src/category/masternode.ts b/packages/jellyfish-api-core/src/category/masternode.ts
index 8b8f94ca4b..5b88f6cbbf 100644
--- a/packages/jellyfish-api-core/src/category/masternode.ts
+++ b/packages/jellyfish-api-core/src/category/masternode.ts
@@ -144,6 +144,24 @@ export class Masternode {
     return await this.client.call('resignmasternode', [masternodeId, utxos], 'number')
   }
 
+  /**
+     * 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.
+     *
+     * @param {string} masternodeId The masternode's id.
+     * @param {UpdateMasternodeValues} values
+     * @param {string} [values.ownerAddress] The new masternode owner address, requires masternode collateral fee (P2PKH or P2WPKH).
+     * @param {string} [values.operatorAddress] The new masternode operator address (P2PKH or P2WPKH).
+     * @param {string} [values.rewardAddress] Masternode`s new reward address, empty "" to remove reward address.
+     * @param {UTXO[]} [utxos = []] Array of specified utxos to spend.
+     * @param {string} [utxos.txid] The transaction id.
+     * @param {number} [utxos.vout] The output number.
+     * @return {Promise<string>} The hex-encoded hash of broadcasted transaction.
+     */
+  async updateMasternode (masternodeId: string, values: UpdateMasternodeValues, utxos: UTXO[] = []): Promise<string> {
+    return await this.client.call('updatemasternode', [masternodeId, values, utxos], 'number')
+  }
+
   /**
    * Set special governance variables
    *
@@ -322,3 +340,9 @@ export interface AnchorTeamResult {
 export interface MasternodeResult<T> {
   [id: string]: T
 }
+
+export interface UpdateMasternodeValues {
+  ownerAddress?: string
+  operatorAddress?: string
+  rewardAddress?: string
+}

From 08c04200e4d8a117723731195afd4dcc9d41ae13 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Fri, 25 Nov 2022 13:25:11 +0800
Subject: [PATCH 21/31] Attempt to fix update owner address in masternode test
 (WIP)

---
 .../txn/txn_builder_masternode_update.test.ts | 85 +++++++++++++------
 .../src/txn/txn_builder.ts                    | 10 ++-
 .../src/txn/txn_builder_masternode.ts         | 14 ++-
 3 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 0715cc1109..b20a10b95c 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,12 +1,13 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
-import { OP_CODES, TransactionSegWit, UpdateMasternode } from '@defichain/jellyfish-transaction'
+import { OP_CODES, TransactionSegWit, UpdateMasternode, Vin } from '@defichain/jellyfish-transaction'
 import { P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
 import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
-import { P2WPKHTransactionBuilder } from '../../src'
+import { P2WPKHTransactionBuilder, Prevout } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
 import { Bech32 } from '@defichain/jellyfish-crypto'
+import { BigNumber } from '@defichain/jellyfish-json'
 
 describe('UpdateMasternode', () => {
   const container = new MasterNodeRegTestContainer()
@@ -30,7 +31,7 @@ describe('UpdateMasternode', () => {
   beforeEach(async () => {
     await providers.randomizeEllipticPair()
     builder = new P2WPKHTransactionBuilder(providers.fee, providers.prevout, providers.elliptic, RegTest)
-    await fundEllipticPair(container, providers.ellipticPair, 10)
+    await fundEllipticPair(container, providers.ellipticPair, 3 + 0.00000755)
     await providers.setupMocks()
 
     // enable updating
@@ -48,18 +49,27 @@ describe('UpdateMasternode', () => {
   })
 
   // todo: need to fix
-  it('should update owner address with P2WPKH address', async () => {
+  it.only('should update owner address with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
-    const address = await container.getNewAddress('', 'bech32')
+    const newAddress = await container.getNewAddress()
+    await jsonRpc.masternode.updateMasternode(masternodeId, {
+      ownerAddress: newAddress
+    })
+
+    await container.generate(65)
+
+    const mnInfo = await jsonRpc.masternode.getMasternode(masternodeId)
+
+    const address = await container.getNewAddress()
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
+      nodeId: masternodeId,
       updates: [
         {
           updateType: 0x01,
@@ -69,26 +79,53 @@ describe('UpdateMasternode', () => {
     }
 
     const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const outs = await sendTransaction(container, txn)
+    const collateralTxId = mnInfo[masternodeId].collateralTx as unknown as string;
 
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
+    const rawTx = await jsonRpc.rawtx.getRawTransaction(collateralTxId, true);
 
-    expect(outs.length).toStrictEqual(2)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+    const collateralVin: Vin = {
+      txid: collateralTxId,
+      index: 1,
+      script: script,
+      sequence: 0xffffffff,
+    }
 
-    expect(outs[1].value).toBeGreaterThan(6)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    const collateralPrevout: Prevout = {
+      txid: collateralTxId,
+      vout: 1,
+      script: script,
+      value: new BigNumber(rawTx.vout[1].value),
+      tokenId: rawTx.vout[1].tokenId
+    }
+
+    const additionalVinData = {
+      vin: collateralVin,
+      prevout: collateralPrevout
+    }
+
+    // const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script, [additionalVinData])
+    const outs = await sendTransaction(container, txn)
+
+    console.log('debug')
+
+    // const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    // const expectedRedeemScript = `6a${encoded}`
+
+    // expect(outs.length).toStrictEqual(2)
+    // expect(outs[0].value).toStrictEqual(0)
+    // expect(outs[0].n).toStrictEqual(0)
+    // expect(outs[0].tokenId).toStrictEqual(0)
+    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    // expect(outs[1].value).toBeGreaterThan(6)
+    // expect(outs[1].n).toStrictEqual(1)
+    // expect(outs[1].tokenId).toStrictEqual(0)
+    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update operator address with P2WPKH address', async () => {
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index 90300bb787..de37b18f1e 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -102,11 +102,15 @@ export abstract class P2WPKHTxnBuilder {
   async createDeFiTx (
     opDeFiTx: OP_DEFI_TX,
     changeScript: Script,
-    outValue: BigNumber = new BigNumber('0')
+    outValue: BigNumber = new BigNumber('0'),
+    additionalVinData: Array<{ vin: Vin, prevout: Prevout }> = []
   ): Promise<TransactionSegWit> {
     const minFee = outValue.plus(0.001) // see JSDoc above
     const { prevouts, vin, total } = await this.collectPrevouts(minFee)
 
+    const manualVins = additionalVinData.map(({ vin }) => vin)
+    const manualPrevouts = additionalVinData.map(({ prevout }) => prevout)
+
     const deFiOut: Vout = {
       value: outValue,
       script: {
@@ -123,7 +127,7 @@ export abstract class P2WPKHTxnBuilder {
 
     const txn: Transaction = {
       version: DeFiTransactionConstants.Version,
-      vin: vin,
+      vin: [...vin, ...manualVins],
       vout: [deFiOut, change],
       lockTime: 0x00000000
     }
@@ -131,7 +135,7 @@ export abstract class P2WPKHTxnBuilder {
     const fee = await this.calculateFee(txn)
     change.value = total.minus(outValue).minus(fee)
 
-    return await this.sign(txn, prevouts)
+    return await this.sign(txn, [...prevouts, ...manualPrevouts])
   }
 
   /**
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index fa7a6f017b..a4627dbebc 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -5,8 +5,10 @@ import {
   ResignMasternode,
   Script,
   TransactionSegWit,
-  UpdateMasternode
+  UpdateMasternode,
+  Vin
 } from '@defichain/jellyfish-transaction'
+import { Prevout } from '..'
 import { P2WPKHTxnBuilder } from './txn_builder'
 
 export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
@@ -50,10 +52,16 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
    * @param {Script} changeScript to send unspent to after deducting the (converted + fees)
    * @return {Promise<TransactionSegWit>}
    */
-  async update (updateMasternode: UpdateMasternode, changeScript: Script): Promise<TransactionSegWit> {
+  async update (
+    updateMasternode: UpdateMasternode,
+    changeScript: Script,
+    additionalVinData?: Array<{ vin: Vin, prevout: Prevout }>
+  ): Promise<TransactionSegWit> {
     return await this.createDeFiTx(
       OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
-      changeScript
+      changeScript,
+      undefined,
+      additionalVinData
     )
   }
 }

From e0de0f41babfe75404cc60b95fd0d94c65a79dac Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Tue, 29 Nov 2022 16:00:21 +0800
Subject: [PATCH 22/31] Update

---
 .../txn/txn_builder_masternode_update.test.ts | 67 +++++++++++++------
 .../src/txn/txn_builder.ts                    | 50 ++++++++++++--
 .../src/txn/txn_builder_masternode.ts         |  7 +-
 3 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index b20a10b95c..fe6c99ecc7 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,6 +1,6 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
-import { OP_CODES, TransactionSegWit, UpdateMasternode, Vin } from '@defichain/jellyfish-transaction'
+import { OP_CODES, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
 import { P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
 import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
@@ -55,16 +55,21 @@ describe('UpdateMasternode', () => {
     const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
-    const newAddress = await container.getNewAddress()
-    await jsonRpc.masternode.updateMasternode(masternodeId, {
-      ownerAddress: newAddress
-    })
+    // const newAddress = await container.getNewAddress()
+    // const firstUpdateTx = await jsonRpc.masternode.updateMasternode(masternodeId, {
+    //   ownerAddress: newAddress
+    // })
 
-    await container.generate(65)
+    // await container.generate(65)
 
-    const mnInfo = await jsonRpc.masternode.getMasternode(masternodeId)
+    // const newAddress2 = await container.getNewAddress()
+    // const secondUpdateTx = await jsonRpc.masternode.updateMasternode(masternodeId, {
+    //   ownerAddress: newAddress2
+    // })
+
+    // await container.generate(65)
 
-    const address = await container.getNewAddress()
+    const address = await container.getNewAddress('', 'bech32')
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
 
@@ -79,30 +84,52 @@ describe('UpdateMasternode', () => {
     }
 
     const script = await providers.elliptic.script()
-    const collateralTxId = mnInfo[masternodeId].collateralTx as unknown as string;
+    const mnInfo = await jsonRpc.masternode.getMasternode(masternodeId)
 
-    const rawTx = await jsonRpc.rawtx.getRawTransaction(collateralTxId, true);
+    // const rawFirstUpdate = await jsonRpc.rawtx.getRawTransaction(firstUpdateTx, true)
+    // const rawSecondUpdate = await jsonRpc.rawtx.getRawTransaction(secondUpdateTx, true)
+    const rawCollateral = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
 
-    const collateralVin: Vin = {
-      txid: collateralTxId,
-      index: 1,
-      script: script,
-      sequence: 0xffffffff,
-    }
+    const collateralTxId = mnInfo[masternodeId].collateralTx as unknown as string;
+    // const collateralTxId = rawCollateral.vin[1].txid
+    // const collateralTxId = masternodeId
 
     const collateralPrevout: Prevout = {
-      txid: collateralTxId,
+      txid: masternodeId,
       vout: 1,
       script: script,
-      value: new BigNumber(rawTx.vout[1].value),
-      tokenId: rawTx.vout[1].tokenId
+      value: new BigNumber(rawCollateral.vout[1].value),
+      tokenId: rawCollateral.vout[1].tokenId
+    }
+
+    const collateralVout: Vout = {
+      script: script,
+      value: new BigNumber(rawCollateral.vout[1].value),
+      tokenId: rawCollateral.vout[1].tokenId
+    }
+
+    const collateralVin: Vin = {
+      txid: masternodeId,
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff,
     }
 
     const additionalVinData = {
+      prevout: collateralPrevout,
       vin: collateralVin,
-      prevout: collateralPrevout
+      vout: collateralVout
     }
 
+    console.log({
+      pubKey,
+      collateralAddress,
+      masternodeId,
+      // newAddress,
+      // newAddress2,
+      collateralTxId,
+    })
+
     // const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script, [additionalVinData])
     const outs = await sendTransaction(container, txn)
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index de37b18f1e..e9e3ece4b2 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -102,15 +102,11 @@ export abstract class P2WPKHTxnBuilder {
   async createDeFiTx (
     opDeFiTx: OP_DEFI_TX,
     changeScript: Script,
-    outValue: BigNumber = new BigNumber('0'),
-    additionalVinData: Array<{ vin: Vin, prevout: Prevout }> = []
+    outValue: BigNumber = new BigNumber('0')
   ): Promise<TransactionSegWit> {
     const minFee = outValue.plus(0.001) // see JSDoc above
     const { prevouts, vin, total } = await this.collectPrevouts(minFee)
 
-    const manualVins = additionalVinData.map(({ vin }) => vin)
-    const manualPrevouts = additionalVinData.map(({ prevout }) => prevout)
-
     const deFiOut: Vout = {
       value: outValue,
       script: {
@@ -127,7 +123,7 @@ export abstract class P2WPKHTxnBuilder {
 
     const txn: Transaction = {
       version: DeFiTransactionConstants.Version,
-      vin: [...vin, ...manualVins],
+      vin: vin,
       vout: [deFiOut, change],
       lockTime: 0x00000000
     }
@@ -135,7 +131,47 @@ export abstract class P2WPKHTxnBuilder {
     const fee = await this.calculateFee(txn)
     change.value = total.minus(outValue).minus(fee)
 
-    return await this.sign(txn, [...prevouts, ...manualPrevouts])
+    return await this.sign(txn, prevouts)
+  }
+
+  async createDeFiTxWithCustomVinVout (
+    opDeFiTx: OP_DEFI_TX,
+    changeScript: Script,
+    outValue: BigNumber = new BigNumber('0'),
+    customVinVout: Array<{ vin: Vin, vout: Vout, prevout: Prevout }> = []
+  ): Promise<TransactionSegWit> {
+    const minFee = outValue.plus(0.001) // see JSDoc above
+    const { prevouts, vin, total } = await this.collectPrevouts(minFee)
+
+    const customVins = customVinVout.map(({ vin }) => vin)
+    const customPrevouts = customVinVout.map(({ prevout }) => prevout)
+    const customVouts = customVinVout.map(({ vout }) => vout)
+
+    const deFiOut: Vout = {
+      value: outValue,
+      script: {
+        stack: [OP_CODES.OP_RETURN, opDeFiTx]
+      },
+      tokenId: 0x00
+    }
+
+    // const change: Vout = {
+    //   value: total,
+    //   script: changeScript,
+    //   tokenId: 0x00
+    // }
+
+    const txn: Transaction = {
+      version: DeFiTransactionConstants.Version,
+      vin: [...vin, ...customVins],
+      vout: [deFiOut, ...customVouts],
+      lockTime: 0x00000000
+    }
+
+    // const fee = await this.calculateFee(txn)
+    // change.value = total.minus(outValue).minus(fee)
+
+    return await this.sign(txn, [...prevouts, ...customPrevouts])
   }
 
   /**
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index a4627dbebc..e1048ef2de 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -6,7 +6,8 @@ import {
   Script,
   TransactionSegWit,
   UpdateMasternode,
-  Vin
+  Vin,
+  Vout
 } from '@defichain/jellyfish-transaction'
 import { Prevout } from '..'
 import { P2WPKHTxnBuilder } from './txn_builder'
@@ -55,9 +56,9 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
   async update (
     updateMasternode: UpdateMasternode,
     changeScript: Script,
-    additionalVinData?: Array<{ vin: Vin, prevout: Prevout }>
+    additionalVinData?: Array<{ vin: Vin, vout: Vout, prevout: Prevout }>
   ): Promise<TransactionSegWit> {
-    return await this.createDeFiTx(
+    return await this.createDeFiTxWithCustomVinVout(
       OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
       changeScript,
       undefined,

From ffbfd9d96720c8308ebca7a6a71739c06d7b427e Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 02:51:38 +0800
Subject: [PATCH 23/31] Fix update owner address test

---
 .../txn/txn_builder_masternode_update.test.ts | 116 +++++++-----------
 .../src/txn/txn_builder.ts                    |  25 ++--
 .../src/txn/txn_builder_masternode.ts         |   4 +-
 3 files changed, 66 insertions(+), 79 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index fe6c99ecc7..8d628a80d4 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -3,10 +3,10 @@ import { RegTest } from '@defichain/jellyfish-network'
 import { OP_CODES, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
 import { P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
 import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
-import { getProviders, MockProviders } from '../provider.mock'
+import { getProviders, MockEllipticPairProvider, MockProviders } from '../provider.mock'
 import { P2WPKHTransactionBuilder, Prevout } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
-import { Bech32 } from '@defichain/jellyfish-crypto'
+import { Bech32, Elliptic } from '@defichain/jellyfish-crypto'
 import { BigNumber } from '@defichain/jellyfish-json'
 
 describe('UpdateMasternode', () => {
@@ -48,29 +48,21 @@ describe('UpdateMasternode', () => {
     expect(balance >= 2).toBeTruthy()
   })
 
-  // todo: need to fix
-  it.only('should update owner address with P2WPKH address', async () => {
+  it('should update owner address with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
+    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const script1 = await providers.elliptic.script()
 
-    // const newAddress = await container.getNewAddress()
-    // const firstUpdateTx = await jsonRpc.masternode.updateMasternode(masternodeId, {
-    //   ownerAddress: newAddress
-    // })
-
-    // await container.generate(65)
-
-    // const newAddress2 = await container.getNewAddress()
-    // const secondUpdateTx = await jsonRpc.masternode.updateMasternode(masternodeId, {
-    //   ownerAddress: newAddress2
-    // })
+    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
+    await container.generate(20)
 
-    // await container.generate(65)
+    // create new elliptic pair for new owner address and script
+    const ellipticPair2 = Elliptic.fromPrivKey(Buffer.alloc(32, Math.random().toString(), 'ascii'))
+    const mockEllipticPair2 = new MockEllipticPairProvider(ellipticPair2)
+    const script2 = await mockEllipticPair2.script()
 
-    const address = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
+    const newAddress = Bech32.fromPubKey(await ellipticPair2.publicKey(), 'bcrt')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
@@ -83,76 +75,62 @@ describe('UpdateMasternode', () => {
       ]
     }
 
-    const script = await providers.elliptic.script()
-    const mnInfo = await jsonRpc.masternode.getMasternode(masternodeId)
-
-    // const rawFirstUpdate = await jsonRpc.rawtx.getRawTransaction(firstUpdateTx, true)
-    // const rawSecondUpdate = await jsonRpc.rawtx.getRawTransaction(secondUpdateTx, true)
-    const rawCollateral = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-
-    const collateralTxId = mnInfo[masternodeId].collateralTx as unknown as string;
-    // const collateralTxId = rawCollateral.vin[1].txid
-    // const collateralTxId = masternodeId
+    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
 
     const collateralPrevout: Prevout = {
       txid: masternodeId,
       vout: 1,
-      script: script,
-      value: new BigNumber(rawCollateral.vout[1].value),
-      tokenId: rawCollateral.vout[1].tokenId
+      script: script1,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
     }
 
     const collateralVout: Vout = {
-      script: script,
-      value: new BigNumber(rawCollateral.vout[1].value),
-      tokenId: rawCollateral.vout[1].tokenId
+      script: script2,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
     }
 
     const collateralVin: Vin = {
       txid: masternodeId,
       index: 1,
       script: { stack: [] },
-      sequence: 0xffffffff,
+      sequence: 0xffffffff
     }
 
-    const additionalVinData = {
+    const customVinVout = {
       prevout: collateralPrevout,
       vin: collateralVin,
       vout: collateralVout
     }
 
-    console.log({
-      pubKey,
-      collateralAddress,
-      masternodeId,
-      // newAddress,
-      // newAddress2,
-      collateralTxId,
-    })
-
-    // const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script, [additionalVinData])
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
     const outs = await sendTransaction(container, txn)
 
-    console.log('debug')
-
-    // const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    // const expectedRedeemScript = `6a${encoded}`
-
-    // expect(outs.length).toStrictEqual(2)
-    // expect(outs[0].value).toStrictEqual(0)
-    // expect(outs[0].n).toStrictEqual(0)
-    // expect(outs[0].tokenId).toStrictEqual(0)
-    // expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    // expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    // expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
-
-    // expect(outs[1].value).toBeGreaterThan(6)
-    // expect(outs[1].n).toStrictEqual(1)
-    // expect(outs[1].tokenId).toStrictEqual(0)
-    // expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    // expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    // expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+    const expectedRedeemScript = `6a${encoded}`
+
+    expect(outs.length).toStrictEqual(3)
+    expect(outs[0].value).toStrictEqual(0)
+    expect(outs[0].n).toStrictEqual(0)
+    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
+    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
+
+    expect(outs[1].value).toStrictEqual(2)
+    expect(outs[1].n).toStrictEqual(1)
+    expect(outs[1].tokenId).toStrictEqual(0)
+    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(newAddress)
+
+    expect(outs[2].value).toBeGreaterThan(72)
+    expect(outs[2].n).toStrictEqual(2)
+    expect(outs[2].tokenId).toStrictEqual(0)
+    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update operator address with P2WPKH address', async () => {
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index e9e3ece4b2..13718f7d51 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -134,6 +134,15 @@ export abstract class P2WPKHTxnBuilder {
     return await this.sign(txn, prevouts)
   }
 
+  /**
+   * Similar to createDeFiTx, craft a transaction with OP_DEFI_TX from the output of OP_CODES.OP_DEFI_TX_
+   * and allow custom input for vin and vout.
+   *
+   * @param {OP_DEFI_TX} opDeFiTx to create
+   * @param {Script} changeScript to send unspent to after deducting the fees
+   * @param {BigNumber} [outValue=0] for the opDeFiTx, usually always be 0.
+   * @param {Array<{ vin: Vin, vout: Vout, prevout: Prevout }>} [customVinVout = []] for custom vin and vout
+   */
   async createDeFiTxWithCustomVinVout (
     opDeFiTx: OP_DEFI_TX,
     changeScript: Script,
@@ -155,21 +164,21 @@ export abstract class P2WPKHTxnBuilder {
       tokenId: 0x00
     }
 
-    // const change: Vout = {
-    //   value: total,
-    //   script: changeScript,
-    //   tokenId: 0x00
-    // }
+    const change: Vout = {
+      value: total,
+      script: changeScript,
+      tokenId: 0x00
+    }
 
     const txn: Transaction = {
       version: DeFiTransactionConstants.Version,
       vin: [...vin, ...customVins],
-      vout: [deFiOut, ...customVouts],
+      vout: [deFiOut, ...customVouts, change],
       lockTime: 0x00000000
     }
 
-    // const fee = await this.calculateFee(txn)
-    // change.value = total.minus(outValue).minus(fee)
+    const fee = await this.calculateFee(txn)
+    change.value = total.minus(outValue).minus(fee)
 
     return await this.sign(txn, [...prevouts, ...customPrevouts])
   }
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index e1048ef2de..c011092c13 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -56,13 +56,13 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
   async update (
     updateMasternode: UpdateMasternode,
     changeScript: Script,
-    additionalVinData?: Array<{ vin: Vin, vout: Vout, prevout: Prevout }>
+    customVinVout?: Array<{ vin: Vin, vout: Vout, prevout: Prevout }>
   ): Promise<TransactionSegWit> {
     return await this.createDeFiTxWithCustomVinVout(
       OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
       changeScript,
       undefined,
-      additionalVinData
+      customVinVout
     )
   }
 }

From 33fe96662fcec031c84288ad57ff9ab1d263eccb Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 12:03:03 +0800
Subject: [PATCH 24/31] Update tests

---
 .../txn/txn_builder_masternode_update.test.ts | 279 ++++++++++++++----
 1 file changed, 217 insertions(+), 62 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 8d628a80d4..89f96dd75f 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,12 +1,12 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
 import { RegTest } from '@defichain/jellyfish-network'
-import { OP_CODES, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
-import { P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
+import { OP_CODES, Script, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
+import { fromAddress, P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
 import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
-import { getProviders, MockEllipticPairProvider, MockProviders } from '../provider.mock'
+import { getProviders, MockProviders } from '../provider.mock'
 import { P2WPKHTransactionBuilder, Prevout } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
-import { Bech32, Elliptic } from '@defichain/jellyfish-crypto'
+import { Bech32 } from '@defichain/jellyfish-crypto'
 import { BigNumber } from '@defichain/jellyfish-json'
 
 describe('UpdateMasternode', () => {
@@ -50,20 +50,16 @@ describe('UpdateMasternode', () => {
 
   it('should update owner address with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
-    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const script1 = await providers.elliptic.script()
 
+    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
     const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
     await container.generate(20)
 
-    // create new elliptic pair for new owner address and script
-    const ellipticPair2 = Elliptic.fromPrivKey(Buffer.alloc(32, Math.random().toString(), 'ascii'))
-    const mockEllipticPair2 = new MockEllipticPairProvider(ellipticPair2)
-    const script2 = await mockEllipticPair2.script()
-
-    const newAddress = Bech32.fromPubKey(await ellipticPair2.publicKey(), 'bcrt')
+    const newAddress = await container.getNewAddress('', 'bech32')
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
+    const script2 = await fromAddress(newAddress, 'regtest')?.script as Script
 
     const updateMasternode: UpdateMasternode = {
       nodeId: masternodeId,
@@ -76,7 +72,6 @@ describe('UpdateMasternode', () => {
     }
 
     const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-
     const collateralPrevout: Prevout = {
       txid: masternodeId,
       vout: 1,
@@ -84,20 +79,17 @@ describe('UpdateMasternode', () => {
       value: new BigNumber(rawCollateralTx.vout[1].value),
       tokenId: rawCollateralTx.vout[1].tokenId
     }
-
     const collateralVout: Vout = {
       script: script2,
       value: new BigNumber(rawCollateralTx.vout[1].value),
       tokenId: rawCollateralTx.vout[1].tokenId
     }
-
     const collateralVin: Vin = {
       txid: masternodeId,
       index: 1,
       script: { stack: [] },
       sequence: 0xffffffff
     }
-
     const customVinVout = {
       prevout: collateralPrevout,
       vin: collateralVin,
@@ -221,10 +213,17 @@ describe('UpdateMasternode', () => {
 
   it('should update multiple addresses simultaneously with P2WPKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
+    const script1 = await providers.elliptic.script()
+
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
+    const ownerAddress = await container.getNewAddress('', 'bech32')
+    const ownerAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, ownerAddress, P2WPKH)
+    const ownerAddressDestKeyHash = ownerAddressDest.pubKeyHash
+    const script2 = await fromAddress(ownerAddress, 'regtest')?.script as Script
+
     const operatorAddress = await container.getNewAddress('', 'bech32')
     const operatorAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress, P2WPKH)
     const operatorAddressDestKeyHash = operatorAddressDest.pubKeyHash
@@ -234,8 +233,12 @@ describe('UpdateMasternode', () => {
     const rewardAddressDestKeyHash = rewardAddressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
+      nodeId: masternodeId,
       updates: [
+        {
+          updateType: 0x01,
+          address: { addressType: 0x04, addressPubKeyHash: ownerAddressDestKeyHash }
+        },
         {
           updateType: 0x02,
           address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash }
@@ -247,14 +250,38 @@ describe('UpdateMasternode', () => {
       ]
     }
 
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
+    const collateralPrevout: Prevout = {
+      txid: masternodeId,
+      vout: 1,
+      script: script1,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVout: Vout = {
+      script: script2,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVin: Vin = {
+      txid: masternodeId,
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff
+    }
+    const customVinVout = {
+      prevout: collateralPrevout,
+      vin: collateralVin,
+      vout: collateralVout
+    }
+
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
     const outs = await sendTransaction(container, txn)
 
     const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
     const expectedRedeemScript = `6a${encoded}`
 
-    expect(outs.length).toStrictEqual(2)
+    expect(outs.length).toStrictEqual(3)
     expect(outs[0].value).toStrictEqual(0)
     expect(outs[0].n).toStrictEqual(0)
     expect(outs[0].tokenId).toStrictEqual(0)
@@ -262,20 +289,34 @@ describe('UpdateMasternode', () => {
     expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
     expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].value).toStrictEqual(2)
     expect(outs[1].n).toStrictEqual(1)
     expect(outs[1].tokenId).toStrictEqual(0)
     expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
     expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(ownerAddress)
+
+    expect(outs[2].value).toBeGreaterThan(72)
+    expect(outs[2].n).toStrictEqual(2)
+    expect(outs[2].tokenId).toStrictEqual(0)
+    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update multiple addresses simultaneously with P2PKH address', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
+    const script1 = await providers.elliptic.script()
+
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
+    const ownerAddress = await container.getNewAddress('', 'legacy')
+    const ownerAddressDest: P2PKH = P2PKH.fromAddress(RegTest, ownerAddress, P2PKH)
+    const ownerAddressDestHex = ownerAddressDest.hex
+    const script2 = await fromAddress(ownerAddress, 'regtest')?.script as Script
+
     const operatorAddress = await container.getNewAddress('', 'legacy')
     const operatorAddressDest: P2PKH = P2PKH.fromAddress(RegTest, operatorAddress, P2PKH)
     const operatorAddressDestHex = operatorAddressDest.hex
@@ -285,8 +326,12 @@ describe('UpdateMasternode', () => {
     const rewardAddressDestHex = rewardAddressDest.hex
 
     const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
+      nodeId: masternodeId,
       updates: [
+        {
+          updateType: 0x01,
+          address: { addressType: 0x01, addressPubKeyHash: ownerAddressDestHex }
+        },
         {
           updateType: 0x02,
           address: { addressType: 0x01, addressPubKeyHash: operatorAddressDestHex }
@@ -298,14 +343,38 @@ describe('UpdateMasternode', () => {
       ]
     }
 
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
+    const collateralPrevout: Prevout = {
+      txid: masternodeId,
+      vout: 1,
+      script: script1,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVout: Vout = {
+      script: script2,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVin: Vin = {
+      txid: masternodeId,
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff
+    }
+    const customVinVout = {
+      prevout: collateralPrevout,
+      vin: collateralVin,
+      vout: collateralVout
+    }
+
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
     const outs = await sendTransaction(container, txn)
 
     const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
     const expectedRedeemScript = `6a${encoded}`
 
-    expect(outs.length).toStrictEqual(2)
+    expect(outs.length).toStrictEqual(3)
     expect(outs[0].value).toStrictEqual(0)
     expect(outs[0].n).toStrictEqual(0)
     expect(outs[0].tokenId).toStrictEqual(0)
@@ -313,12 +382,19 @@ describe('UpdateMasternode', () => {
     expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
     expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].value).toStrictEqual(2)
     expect(outs[1].n).toStrictEqual(1)
     expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[1].scriptPubKey.type).toStrictEqual('pubkeyhash')
     expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(ownerAddress)
+
+    expect(outs[2].value).toBeGreaterThan(72)
+    expect(outs[2].n).toStrictEqual(2)
+    expect(outs[2].tokenId).toStrictEqual(0)
+    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
+    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
+    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update remove reward address', async () => {
@@ -382,29 +458,59 @@ describe('UpdateMasternode', () => {
   it('should fail if address is P2SH', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
     const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(20)
 
-    const address = await container.getNewAddress('', 'p2sh-segwit')
-    const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-    const addressDestHex = addressDest.hex
-
     const script = await providers.elliptic.script()
 
-    // todo: need to fix
     {
+      const address = await container.getNewAddress('', 'p2sh-segwit')
+      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+      const addressDestHex = addressDest.hex
+      const script2 = fromAddress(address, 'regtest')?.script as Script
+
       const updateMasternode: UpdateMasternode = {
-        nodeId: txid,
+        nodeId: masternodeId,
         updates: [{ updateType: 0x01, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
       }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+
+      const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
+      const collateralPrevout: Prevout = {
+        txid: masternodeId,
+        vout: 1,
+        script: script,
+        value: new BigNumber(rawCollateralTx.vout[1].value),
+        tokenId: rawCollateralTx.vout[1].tokenId
+      }
+      const collateralVout: Vout = {
+        script: script2,
+        value: new BigNumber(rawCollateralTx.vout[1].value),
+        tokenId: rawCollateralTx.vout[1].tokenId
+      }
+      const collateralVin: Vin = {
+        txid: masternodeId,
+        index: 1,
+        script: { stack: [] },
+        sequence: 0xffffffff
+      }
+      const customVinVout = {
+        prevout: collateralPrevout,
+        vin: collateralVin,
+        vout: collateralVout
+      }
+
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script, [customVinVout])
       const promise = sendTransaction(container, txn)
       await expect(promise).rejects.toThrow(DeFiDRpcError)
       await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)', code: -26")
     }
     {
+      const address = await container.getNewAddress('', 'p2sh-segwit')
+      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+      const addressDestHex = addressDest.hex
+
       const updateMasternode: UpdateMasternode = {
-        nodeId: txid,
+        nodeId: masternodeId,
         updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
       }
       const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
@@ -413,8 +519,12 @@ describe('UpdateMasternode', () => {
       await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)', code: -26")
     }
     {
+      const address = await container.getNewAddress('', 'p2sh-segwit')
+      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
+      const addressDestHex = addressDest.hex
+
       const updateMasternode: UpdateMasternode = {
-        nodeId: txid,
+        nodeId: masternodeId,
         updates: [{ updateType: 0x03, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
       }
       const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
@@ -433,19 +543,6 @@ describe('UpdateMasternode', () => {
 
     const script = await providers.elliptic.script()
 
-    // todo: need to fix
-    {
-      const invalidAddress = 'INVALID_ADDRESS'
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
-      }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)\', code: -26')
-    }
-
     {
       const invalidAddress = 'INVALID_ADDRESS'
       const updateMasternode: UpdateMasternode = {
@@ -471,18 +568,19 @@ describe('UpdateMasternode', () => {
     }
   })
 
-  // todo: need to fix
-  it('should fail to update owner address with same address', async () => {
+  it('should fail to update owner address without collateral transaction inputs', async () => {
     const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
+    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+
+    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
     await container.generate(20)
 
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, collateralAddress, P2WPKH)
+    const address = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
 
     const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
+      nodeId: masternodeId,
       updates: [
         {
           updateType: 0x01,
@@ -494,23 +592,80 @@ describe('UpdateMasternode', () => {
     const script = await providers.elliptic.script()
     const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
     const promise = sendTransaction(container, txn)
+
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Missing previous collateral from transaction inputs (code 16)', code: -26")
+  })
+
+  it('should fail to update owner address with same address', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const script1 = await providers.elliptic.script()
+
+    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
+    await container.generate(20)
+
+    const newAddress = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
+    const addressDestKeyHash = addressDest.pubKeyHash
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: masternodeId,
+      updates: [
+        {
+          updateType: 0x01,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
+        }
+      ]
+    }
+
+    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
+    const collateralPrevout: Prevout = {
+      txid: masternodeId,
+      vout: 1,
+      script: script1,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVout: Vout = {
+      script: script1,
+      value: new BigNumber(rawCollateralTx.vout[1].value),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVin: Vin = {
+      txid: masternodeId,
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff
+    }
+    const customVinVout = {
+      prevout: collateralPrevout,
+      vin: collateralVin,
+      vout: collateralVout
+    }
+
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
+    const promise = sendTransaction(container, txn)
+
     await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'Test UpdateMasternodeTx execution failed:\nMasternode with collateral address as operator or owner already exists', code: -32600, method: updatemasternode")
+    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode with collateral address as operator or owner already exists (code 16)', code: -26")
   })
 
   it('should fail to update another node with operator address that is already used', async () => {
     const pubKey1 = await providers.ellipticPair.publicKey()
     const collateralAddress1 = Bech32.fromPubKey(pubKey1, 'bcrt')
-    await jsonRpc.masternode.createMasternode(collateralAddress1)
     const addressDest1: P2WPKH = P2WPKH.fromAddress(RegTest, collateralAddress1, P2WPKH)
     const addressDestKeyHash1 = addressDest1.pubKeyHash
 
+    await jsonRpc.masternode.createMasternode(collateralAddress1)
+    await container.generate(20)
+
     await providers.randomizeEllipticPair()
     await providers.setupMocks()
     const pubKey2 = await providers.ellipticPair.publicKey()
     const collateralAddress2 = Bech32.fromPubKey(pubKey2, 'bcrt')
-    const masternodeId2 = await jsonRpc.masternode.createMasternode(collateralAddress2)
 
+    const masternodeId2 = await jsonRpc.masternode.createMasternode(collateralAddress2)
     await container.generate(20)
 
     const updateMasternode: UpdateMasternode = {

From 75cfbb92159ca85212d8a076b24c2f55acd61d72 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 12:57:42 +0800
Subject: [PATCH 25/31] Update tests to use object assertion

---
 .../txn/txn_builder_masternode_update.test.ts | 247 ++++++++++++------
 1 file changed, 168 insertions(+), 79 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 89f96dd75f..adb2b5eae1 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -103,26 +103,44 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(3)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toStrictEqual(2)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(newAddress)
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: 2,
+      scriptPubKey: {
+        addresses: [newAddress],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
 
+    expect(outs[2]).toStrictEqual({
+      n: 2,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
     expect(outs[2].value).toBeGreaterThan(72)
-    expect(outs[2].n).toStrictEqual(2)
-    expect(outs[2].tokenId).toStrictEqual(0)
-    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update operator address with P2WPKH address', async () => {
@@ -153,19 +171,31 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(2)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
     expect(outs[1].value).toBeGreaterThan(6)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update reward address with P2WPKH address', async () => {
@@ -196,19 +226,31 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(2)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
     expect(outs[1].value).toBeGreaterThan(6)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update multiple addresses simultaneously with P2WPKH address', async () => {
@@ -282,26 +324,44 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(3)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toStrictEqual(2)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(ownerAddress)
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: 2,
+      scriptPubKey: {
+        addresses: [ownerAddress],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
 
+    expect(outs[2]).toStrictEqual({
+      n: 2,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
     expect(outs[2].value).toBeGreaterThan(72)
-    expect(outs[2].n).toStrictEqual(2)
-    expect(outs[2].tokenId).toStrictEqual(0)
-    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should update multiple addresses simultaneously with P2PKH address', async () => {
@@ -375,26 +435,43 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(3)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
-    expect(outs[1].value).toStrictEqual(2)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('pubkeyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(ownerAddress)
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: 2,
+      scriptPubKey: {
+        addresses: [ownerAddress],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'pubkeyhash'
+      }
+    })
 
-    expect(outs[2].value).toBeGreaterThan(72)
-    expect(outs[2].n).toStrictEqual(2)
-    expect(outs[2].tokenId).toStrictEqual(0)
-    expect(outs[2].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[2].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[2].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
+    expect(outs[2]).toStrictEqual({
+      n: 2,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
   })
 
   it('should update remove reward address', async () => {
@@ -440,19 +517,31 @@ describe('UpdateMasternode', () => {
     const expectedRedeemScript = `6a${encoded}`
 
     expect(outs.length).toStrictEqual(2)
-    expect(outs[0].value).toStrictEqual(0)
-    expect(outs[0].n).toStrictEqual(0)
-    expect(outs[0].tokenId).toStrictEqual(0)
+    expect(outs[0]).toStrictEqual({
+      n: 0,
+      tokenId: 0,
+      value: 0,
+      scriptPubKey: {
+        asm: expect.any(String),
+        hex: expectedRedeemScript,
+        type: 'nulldata'
+      }
+    })
     expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-    expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    expect(outs[0].scriptPubKey.type).toStrictEqual('nulldata')
 
+    expect(outs[1]).toStrictEqual({
+      n: 1,
+      tokenId: 0,
+      value: expect.any(Number),
+      scriptPubKey: {
+        addresses: [await providers.getAddress()],
+        asm: expect.any(String),
+        hex: expect.any(String),
+        reqSigs: 1,
+        type: 'witness_v0_keyhash'
+      }
+    })
     expect(outs[1].value).toBeGreaterThan(6)
-    expect(outs[1].n).toStrictEqual(1)
-    expect(outs[1].tokenId).toStrictEqual(0)
-    expect(outs[1].scriptPubKey.type).toStrictEqual('witness_v0_keyhash')
-    expect(outs[1].scriptPubKey.reqSigs).toStrictEqual(1)
-    expect(outs[1].scriptPubKey.addresses[0]).toStrictEqual(await providers.getAddress())
   })
 
   it('should fail if address is P2SH', async () => {

From b55852ee972de79e4a89411a25f4e296e14ec0e2 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 13:20:31 +0800
Subject: [PATCH 26/31] Minor refactor and fix for test

---
 .../txn/txn_builder_masternode_update.test.ts | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index adb2b5eae1..f249f649bb 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -108,13 +108,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,
@@ -127,7 +125,6 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-
     expect(outs[2]).toStrictEqual({
       n: 2,
       tokenId: 0,
@@ -176,13 +173,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,
@@ -231,13 +226,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,
@@ -329,13 +322,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,
@@ -348,7 +339,6 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-
     expect(outs[2]).toStrictEqual({
       n: 2,
       tokenId: 0,
@@ -361,7 +351,6 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-    expect(outs[2].value).toBeGreaterThan(72)
   })
 
   it('should update multiple addresses simultaneously with P2PKH address', async () => {
@@ -440,13 +429,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,
@@ -459,7 +446,6 @@ describe('UpdateMasternode', () => {
         type: 'pubkeyhash'
       }
     })
-
     expect(outs[2]).toStrictEqual({
       n: 2,
       tokenId: 0,
@@ -522,13 +508,11 @@ describe('UpdateMasternode', () => {
       tokenId: 0,
       value: 0,
       scriptPubKey: {
-        asm: expect.any(String),
+        asm: expect.stringContaining('OP_RETURN 446654786d'),
         hex: expectedRedeemScript,
         type: 'nulldata'
       }
     })
-    expect(outs[0].scriptPubKey.asm.startsWith('OP_RETURN 446654786d')).toBeTruthy()
-
     expect(outs[1]).toStrictEqual({
       n: 1,
       tokenId: 0,

From 8d2f170f02c7afcc9653eaeb4893944ff82163e1 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 18:42:01 +0800
Subject: [PATCH 27/31] Add tests

---
 .../txn/txn_builder_masternode_update.test.ts | 207 +++++++++++++++++-
 .../src/txn/txn_builder.ts                    |  47 +---
 .../src/txn/txn_builder_masternode.ts         |   2 +-
 3 files changed, 210 insertions(+), 46 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index f249f649bb..86855bc054 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -1,5 +1,5 @@
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
-import { RegTest } from '@defichain/jellyfish-network'
+import { RegTest, RegTestFoundationKeys } from '@defichain/jellyfish-network'
 import { OP_CODES, Script, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
 import { fromAddress, P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
 import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
@@ -8,6 +8,7 @@ import { P2WPKHTransactionBuilder, Prevout } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
 import { Bech32 } from '@defichain/jellyfish-crypto'
 import { BigNumber } from '@defichain/jellyfish-json'
+import { Testing, TestingGroup } from '@defichain/jellyfish-testing'
 
 describe('UpdateMasternode', () => {
   const container = new MasterNodeRegTestContainer()
@@ -757,4 +758,208 @@ describe('UpdateMasternode', () => {
     await expect(promise).rejects.toThrow(DeFiDRpcError)
     await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode with that operator address already exists (code 16)', code: -26")
   })
+
+  it('should fail with incorrect collateral amount', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const script1 = await providers.elliptic.script()
+
+    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
+    await container.generate(20)
+
+    const newAddress = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
+    const addressDestKeyHash = addressDest.pubKeyHash
+    const script2 = await fromAddress(newAddress, 'regtest')?.script as Script
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: masternodeId,
+      updates: [
+        {
+          updateType: 0x01,
+          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
+        }
+      ]
+    }
+
+    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
+    const collateralPrevout: Prevout = {
+      txid: masternodeId,
+      vout: 1,
+      script: script1,
+      value: new BigNumber(5),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVout: Vout = {
+      script: script2,
+      value: new BigNumber(5),
+      tokenId: rawCollateralTx.vout[1].tokenId
+    }
+    const collateralVin: Vin = {
+      txid: masternodeId,
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff
+    }
+    const customVinVout = {
+      prevout: collateralPrevout,
+      vin: collateralVin,
+      vout: collateralVout
+    }
+
+    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
+    const promise = sendTransaction(container, txn)
+
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Incorrect collateral amount (code 16)\', code: -26')
+  })
+
+  it('should not update masternode while in PRE_ENABLED or TRANSFERRING state', async () => {
+    const pubKey = await providers.ellipticPair.publicKey()
+    const script = await providers.elliptic.script()
+    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
+    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
+    await container.generate(1)
+
+    const address = await container.getNewAddress('', 'bech32')
+    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
+    const addressDestKeyHash = addressDest.pubKeyHash
+
+    {
+      const updateMasternode: UpdateMasternode = {
+        nodeId: masternodeId,
+        updates: [
+          {
+            updateType: 0x02,
+            address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
+          }
+        ]
+      }
+
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const promise = sendTransaction(container, txn)
+      await expect(promise).rejects.toThrow(DeFiDRpcError)
+      await expect(promise).rejects.toThrow(`DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode ${masternodeId} is not in 'ENABLED' state (code 16)', code: -26`)
+    }
+
+    {
+      const masternodes = await jsonRpc.masternode.listMasternodes()
+      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
+        state: 'PRE_ENABLED',
+        ownerAuthAddress: collateralAddress
+      }))
+    }
+
+    await container.generate(20)
+
+    {
+      const updateMasternode: UpdateMasternode = {
+        nodeId: masternodeId,
+        updates: [
+          {
+            updateType: 0x02,
+            address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
+          }
+        ]
+      }
+
+      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
+      const outs = await sendTransaction(container, txn)
+
+      const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
+      const expectedRedeemScript = `6a${encoded}`
+      expect(outs.length).toStrictEqual(2)
+      expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
+    }
+
+    await container.generate(20)
+
+    {
+      const masternodes = await jsonRpc.masternode.listMasternodes()
+      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
+        state: 'TRANSFERRING',
+        ownerAuthAddress: collateralAddress
+      }))
+    }
+
+    await container.generate(45)
+
+    {
+      const masternodes = await jsonRpc.masternode.listMasternodes()
+      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
+        state: 'ENABLED',
+        ownerAuthAddress: collateralAddress
+      }))
+    }
+  })
+})
+
+describe('Update Masternode (Multi-containers)', () => {
+  let tGroup: TestingGroup
+  const node: Testing[] = []
+  let builderNode1: P2WPKHTransactionBuilder
+  let providersNode1: MockProviders
+
+  beforeAll(async () => {
+    tGroup = TestingGroup.create(2, i => new MasterNodeRegTestContainer(RegTestFoundationKeys[i]))
+    await tGroup.start()
+    node.push(tGroup.get(0))
+    node.push(tGroup.get(1))
+    await node[0].container.waitForWalletCoinbaseMaturity()
+    await node[0].container.waitForWalletBalanceGTE(1000)
+    providersNode1 = await getProviders(node[1].container)
+
+    await providersNode1.randomizeEllipticPair()
+    builderNode1 = new P2WPKHTransactionBuilder(providersNode1.fee, providersNode1.prevout, providersNode1.elliptic, RegTest)
+    await fundEllipticPair(node[1].container, providersNode1.ellipticPair, 10)
+    await providersNode1.setupMocks()
+
+    await node[0].container.generate(1)
+    await node[1].container.generate(1)
+  })
+
+  afterAll(async () => {
+    await tGroup.stop()
+  })
+
+  it('should throw error if incorrect authorization is provided', async () => {
+    await node[0].container.waitForWalletCoinbaseMaturity()
+    await node[1].container.waitForWalletCoinbaseMaturity()
+
+    // enable updating
+    await node[0].rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/mn-setowneraddress': 'true',
+        'v0/params/feature/mn-setoperatoraddress': 'true',
+        'v0/params/feature/mn-setrewardaddress': 'true'
+      }
+    })
+    await node[0].generate(1)
+
+    const masternodeOwnerAddress = await node[0].rpc.wallet.getNewAddress()
+    const masternodeId = await node[0].rpc.masternode.createMasternode(masternodeOwnerAddress)
+    await node[0].generate(100) // create masternode and wait for it to be enabled
+
+    const operatorAddress = await node[0].rpc.wallet.getNewAddress()
+    const operatorAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress, P2WPKH)
+    const operatorAddressDestKeyHash = operatorAddressDest.pubKeyHash
+    const operatorScript = await fromAddress(operatorAddress, 'regtest')?.script as Script
+    await node[0].generate(4)
+    await tGroup.waitForSync() // container2 should know about the new masternode
+
+    const updateMasternode: UpdateMasternode = {
+      nodeId: masternodeId,
+      updates: [
+        {
+          updateType: 0x02,
+          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash }
+        }
+      ]
+    }
+    const txn: TransactionSegWit = await builderNode1.masternode.update(updateMasternode, operatorScript)
+    const promise = sendTransaction(node[1].container, txn)
+
+    await expect(promise).rejects.toThrow(DeFiDRpcError)
+    await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: tx must have at least one input from the owner (code 16)\', code: -26')
+  })
 })
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index 13718f7d51..3289e2e397 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -89,6 +89,8 @@ export abstract class P2WPKHTxnBuilder {
    * Craft a transaction with OP_DEFI_TX from the output of OP_CODES.OP_DEFI_TX_.
    * This is a helper method for creating custom defi transactions.
    *
+   * Optionally, allow for custom inputs with vin and vout.
+   *
    * As DeFi custom transaction will always require small amount of DFI,
    * collectPrevouts() is set to search for at least 0.001 DFI amount of prevout.
    * This will also evidently merge small prevout during the operation.
@@ -98,52 +100,9 @@ export abstract class P2WPKHTxnBuilder {
    * @param {OP_DEFI_TX} opDeFiTx to create
    * @param {Script} changeScript to send unspent to after deducting the fees
    * @param {BigNumber} [outValue=0] for the opDeFiTx, usually always be 0.
-   */
-  async createDeFiTx (
-    opDeFiTx: OP_DEFI_TX,
-    changeScript: Script,
-    outValue: BigNumber = new BigNumber('0')
-  ): Promise<TransactionSegWit> {
-    const minFee = outValue.plus(0.001) // see JSDoc above
-    const { prevouts, vin, total } = await this.collectPrevouts(minFee)
-
-    const deFiOut: Vout = {
-      value: outValue,
-      script: {
-        stack: [OP_CODES.OP_RETURN, opDeFiTx]
-      },
-      tokenId: 0x00
-    }
-
-    const change: Vout = {
-      value: total,
-      script: changeScript,
-      tokenId: 0x00
-    }
-
-    const txn: Transaction = {
-      version: DeFiTransactionConstants.Version,
-      vin: vin,
-      vout: [deFiOut, change],
-      lockTime: 0x00000000
-    }
-
-    const fee = await this.calculateFee(txn)
-    change.value = total.minus(outValue).minus(fee)
-
-    return await this.sign(txn, prevouts)
-  }
-
-  /**
-   * Similar to createDeFiTx, craft a transaction with OP_DEFI_TX from the output of OP_CODES.OP_DEFI_TX_
-   * and allow custom input for vin and vout.
-   *
-   * @param {OP_DEFI_TX} opDeFiTx to create
-   * @param {Script} changeScript to send unspent to after deducting the fees
-   * @param {BigNumber} [outValue=0] for the opDeFiTx, usually always be 0.
    * @param {Array<{ vin: Vin, vout: Vout, prevout: Prevout }>} [customVinVout = []] for custom vin and vout
    */
-  async createDeFiTxWithCustomVinVout (
+  async createDeFiTx (
     opDeFiTx: OP_DEFI_TX,
     changeScript: Script,
     outValue: BigNumber = new BigNumber('0'),
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index c011092c13..1c0526c1fe 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -58,7 +58,7 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
     changeScript: Script,
     customVinVout?: Array<{ vin: Vin, vout: Vout, prevout: Prevout }>
   ): Promise<TransactionSegWit> {
-    return await this.createDeFiTxWithCustomVinVout(
+    return await this.createDeFiTx(
       OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
       changeScript,
       undefined,

From d1300081270f470f4c37cd77e45242131b206c65 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Wed, 30 Nov 2022 19:06:17 +0800
Subject: [PATCH 28/31] Add test for createDeFiTx

---
 .../__tests__/txn/txn_builder_p2wpkh.test.ts  | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
index 6e0740cad4..e6d8da354a 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
@@ -1,9 +1,9 @@
 import BigNumber from 'bignumber.js'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
-import { P2WPKHTxnBuilder } from '../../src'
+import { P2WPKHTxnBuilder, Prevout } from '../../src'
 import { fundEllipticPair } from '../test.utils'
-import { CDfTx, DeFiOpUnmapped, OP_CODES, OP_DEFI_TX } from '@defichain/jellyfish-transaction'
+import { CDfTx, DeFiOpUnmapped, OP_CODES, OP_DEFI_TX, Vin, Vout } from '@defichain/jellyfish-transaction'
 import { RegTest } from '@defichain/jellyfish-network'
 
 // P2WPKHTxnBuilder is abstract and not instantiable
@@ -92,4 +92,46 @@ describe('createDeFiTx()', () => {
     expect(result.vout[1].value.gt(new BigNumber(99.999).minus(spendAmount))).toBeTruthy()
     expect(result.vout[1].value.lt(new BigNumber(100).minus(spendAmount))).toBeTruthy()
   })
+
+  it('should create DfTx stack correctly with custom vin and vout', async () => {
+    const script = await providers.elliptic.script()
+
+    const collateralPrevout: Prevout = {
+      txid: '1111111122222222333333334444444455555555666666667777777788888888',
+      vout: 0,
+      script: script,
+      value: new BigNumber(15),
+      tokenId: 0
+    }
+    const collateralVout: Vout = {
+      script: script,
+      value: new BigNumber(15),
+      tokenId: 0
+    }
+    const collateralVin: Vin = {
+      txid: '1111111122222222333333334444444455555555666666667777777788888888',
+      index: 1,
+      script: { stack: [] },
+      sequence: 0xffffffff
+    }
+    const customVinVout = {
+      prevout: collateralPrevout,
+      vin: collateralVin,
+      vout: collateralVout
+    }
+
+    const result = await builder.createDeFiTx(dummyDfTx, script, undefined, [customVinVout])
+
+    expect(result.vin.length).toStrictEqual(8)
+    expect(result.vout.length).toStrictEqual(3)
+
+    expect(result.vout[0].value).toStrictEqual(new BigNumber(0))
+    expect(result.vout[1]).toStrictEqual(expect.objectContaining({
+      value: new BigNumber(15),
+      script: script
+    }))
+    expect(result.vout[2].value.gt(99.999)).toBeTruthy()
+    expect(result.vout[2].value.lt(100)).toBeTruthy()
+    expect(result.vout[2].script).toStrictEqual(script)
+  })
 })

From 444d86ec5e8468cb5f154cc32a4b0b0cefd78e51 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Thu, 1 Dec 2022 12:08:00 +0800
Subject: [PATCH 29/31] Update vout utxo amounts to be more deterministic

---
 .../txn/txn_builder_masternode_update.test.ts  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index 86855bc054..ba15ad4e2f 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -32,7 +32,7 @@ describe('UpdateMasternode', () => {
   beforeEach(async () => {
     await providers.randomizeEllipticPair()
     builder = new P2WPKHTransactionBuilder(providers.fee, providers.prevout, providers.elliptic, RegTest)
-    await fundEllipticPair(container, providers.ellipticPair, 3 + 0.00000755)
+    await fundEllipticPair(container, providers.ellipticPair, 10)
     await providers.setupMocks()
 
     // enable updating
@@ -138,7 +138,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-    expect(outs[2].value).toBeGreaterThan(72)
+    expect(outs[2].value).toBeGreaterThan(6.99)
+    expect(outs[2].value).toBeLessThan(7)
   })
 
   it('should update operator address with P2WPKH address', async () => {
@@ -191,7 +192,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].value).toBeGreaterThan(6.99)
+    expect(outs[1].value).toBeLessThan(7)
   })
 
   it('should update reward address with P2WPKH address', async () => {
@@ -244,7 +246,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].value).toBeGreaterThan(6.99)
+    expect(outs[1].value).toBeLessThan(7)
   })
 
   it('should update multiple addresses simultaneously with P2WPKH address', async () => {
@@ -352,6 +355,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
+    expect(outs[2].value).toBeGreaterThan(6.99)
+    expect(outs[2].value).toBeLessThan(7)
   })
 
   it('should update multiple addresses simultaneously with P2PKH address', async () => {
@@ -459,6 +464,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
+    expect(outs[2].value).toBeGreaterThan(6.99)
+    expect(outs[2].value).toBeLessThan(7)
   })
 
   it('should update remove reward address', async () => {
@@ -526,7 +533,8 @@ describe('UpdateMasternode', () => {
         type: 'witness_v0_keyhash'
       }
     })
-    expect(outs[1].value).toBeGreaterThan(6)
+    expect(outs[1].value).toBeGreaterThan(6.99)
+    expect(outs[1].value).toBeLessThan(7)
   })
 
   it('should fail if address is P2SH', async () => {

From 0574935747e5dde05634133801c7538fee512723 Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Thu, 1 Dec 2022 12:21:40 +0800
Subject: [PATCH 30/31] Resolve PR comments

---
 .../txn/txn_builder_masternode_update.test.ts | 36 +++++++++++--------
 .../src/txn/txn_builder_masternode.ts         |  1 +
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
index ba15ad4e2f..9a1c6d0036 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
@@ -829,6 +829,14 @@ describe('UpdateMasternode', () => {
     const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
     await container.generate(1)
 
+    {
+      const masternodes = await jsonRpc.masternode.listMasternodes()
+      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
+        state: 'PRE_ENABLED',
+        ownerAuthAddress: collateralAddress
+      }))
+    }
+
     const address = await container.getNewAddress('', 'bech32')
     const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
     const addressDestKeyHash = addressDest.pubKeyHash
@@ -850,16 +858,16 @@ describe('UpdateMasternode', () => {
       await expect(promise).rejects.toThrow(`DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode ${masternodeId} is not in 'ENABLED' state (code 16)', code: -26`)
     }
 
+    await container.generate(20)
+
     {
       const masternodes = await jsonRpc.masternode.listMasternodes()
       expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
-        state: 'PRE_ENABLED',
+        state: 'ENABLED',
         ownerAuthAddress: collateralAddress
       }))
     }
 
-    await container.generate(20)
-
     {
       const updateMasternode: UpdateMasternode = {
         nodeId: masternodeId,
@@ -880,8 +888,6 @@ describe('UpdateMasternode', () => {
       expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
     }
 
-    await container.generate(20)
-
     {
       const masternodes = await jsonRpc.masternode.listMasternodes()
       expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
@@ -944,27 +950,27 @@ describe('Update Masternode (Multi-containers)', () => {
     })
     await node[0].generate(1)
 
-    const masternodeOwnerAddress = await node[0].rpc.wallet.getNewAddress()
-    const masternodeId = await node[0].rpc.masternode.createMasternode(masternodeOwnerAddress)
+    const masternodeOwnerAddress0 = await node[0].rpc.wallet.getNewAddress()
+    const masternodeId0 = await node[0].rpc.masternode.createMasternode(masternodeOwnerAddress0)
     await node[0].generate(100) // create masternode and wait for it to be enabled
 
-    const operatorAddress = await node[0].rpc.wallet.getNewAddress()
-    const operatorAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress, P2WPKH)
-    const operatorAddressDestKeyHash = operatorAddressDest.pubKeyHash
-    const operatorScript = await fromAddress(operatorAddress, 'regtest')?.script as Script
+    const operatorAddress0 = await node[0].rpc.wallet.getNewAddress()
+    const operatorAddressDest0: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress0, P2WPKH)
+    const operatorAddressDestKeyHash0 = operatorAddressDest0.pubKeyHash
+    const operatorScript = await fromAddress(operatorAddress0, 'regtest')?.script as Script
     await node[0].generate(4)
     await tGroup.waitForSync() // container2 should know about the new masternode
 
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
+    const updateMasternode0: UpdateMasternode = {
+      nodeId: masternodeId0,
       updates: [
         {
           updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash }
+          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash0 }
         }
       ]
     }
-    const txn: TransactionSegWit = await builderNode1.masternode.update(updateMasternode, operatorScript)
+    const txn: TransactionSegWit = await builderNode1.masternode.update(updateMasternode0, operatorScript)
     const promise = sendTransaction(node[1].container, txn)
 
     await expect(promise).rejects.toThrow(DeFiDRpcError)
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index 1c0526c1fe..31ce6d684e 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -51,6 +51,7 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
    *
    * @param {UpdateMasternode} updateMasternode transaction to create
    * @param {Script} changeScript to send unspent to after deducting the (converted + fees)
+   * @param {Array<{ vin: Vin, vout: Vout, prevout: Prevout }>} [customVinVout = []] for custom vin and vout when updating owner address
    * @return {Promise<TransactionSegWit>}
    */
   async update (

From 71da6aa550ce21db3cd5aeb14224eba7fe3764ab Mon Sep 17 00:00:00 2001
From: Mark Tan <marktanrj@gmail.com>
Date: Thu, 1 Dec 2022 14:30:30 +0800
Subject: [PATCH 31/31] Remove transaction builder code and shift into separate
 branch

---
 .../txn/txn_builder_masternode_update.test.ts | 979 ------------------
 .../__tests__/txn/txn_builder_p2wpkh.test.ts  |  46 +-
 .../src/txn/txn_builder.ts                    |  16 +-
 .../src/txn/txn_builder_masternode.ts         |  27 +-
 4 files changed, 7 insertions(+), 1061 deletions(-)
 delete mode 100644 packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
deleted file mode 100644
index 9a1c6d0036..0000000000
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_masternode_update.test.ts
+++ /dev/null
@@ -1,979 +0,0 @@
-import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
-import { RegTest, RegTestFoundationKeys } from '@defichain/jellyfish-network'
-import { OP_CODES, Script, TransactionSegWit, UpdateMasternode, Vin, Vout } from '@defichain/jellyfish-transaction'
-import { fromAddress, P2PKH, P2SH, P2WPKH } from '@defichain/jellyfish-address'
-import { DeFiDRpcError, MasterNodeRegTestContainer } from '@defichain/testcontainers'
-import { getProviders, MockProviders } from '../provider.mock'
-import { P2WPKHTransactionBuilder, Prevout } from '../../src'
-import { fundEllipticPair, sendTransaction } from '../test.utils'
-import { Bech32 } from '@defichain/jellyfish-crypto'
-import { BigNumber } from '@defichain/jellyfish-json'
-import { Testing, TestingGroup } from '@defichain/jellyfish-testing'
-
-describe('UpdateMasternode', () => {
-  const container = new MasterNodeRegTestContainer()
-  let providers: MockProviders
-  let builder: P2WPKHTransactionBuilder
-  let jsonRpc: JsonRpcClient
-
-  beforeAll(async () => {
-    await container.start()
-    await container.waitForWalletCoinbaseMaturity()
-    await container.waitForWalletBalanceGTE(1000)
-
-    jsonRpc = new JsonRpcClient(await container.getCachedRpcUrl())
-    providers = await getProviders(container)
-  })
-
-  afterAll(async () => {
-    await container.stop()
-  })
-
-  beforeEach(async () => {
-    await providers.randomizeEllipticPair()
-    builder = new P2WPKHTransactionBuilder(providers.fee, providers.prevout, providers.elliptic, RegTest)
-    await fundEllipticPair(container, providers.ellipticPair, 10)
-    await providers.setupMocks()
-
-    // enable updating
-    await jsonRpc.masternode.setGov({
-      ATTRIBUTES: {
-        'v0/params/feature/mn-setowneraddress': 'true',
-        'v0/params/feature/mn-setoperatoraddress': 'true',
-        'v0/params/feature/mn-setrewardaddress': 'true'
-      }
-    })
-    await container.generate(1)
-
-    const balance = await container.call('getbalance')
-    expect(balance >= 2).toBeTruthy()
-  })
-
-  it('should update owner address with P2WPKH address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const script1 = await providers.elliptic.script()
-
-    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
-    await container.generate(20)
-
-    const newAddress = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-    const script2 = await fromAddress(newAddress, 'regtest')?.script as Script
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-    const collateralPrevout: Prevout = {
-      txid: masternodeId,
-      vout: 1,
-      script: script1,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVout: Vout = {
-      script: script2,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVin: Vin = {
-      txid: masternodeId,
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(3)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: 2,
-      scriptPubKey: {
-        addresses: [newAddress],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[2]).toStrictEqual({
-      n: 2,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[2].value).toBeGreaterThan(6.99)
-    expect(outs[2].value).toBeLessThan(7)
-  })
-
-  it('should update operator address with P2WPKH address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const address = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
-      updates: [
-        {
-          updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(2)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[1].value).toBeGreaterThan(6.99)
-    expect(outs[1].value).toBeLessThan(7)
-  })
-
-  it('should update reward address with P2WPKH address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const address = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
-      updates: [
-        {
-          updateType: 0x03,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(2)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[1].value).toBeGreaterThan(6.99)
-    expect(outs[1].value).toBeLessThan(7)
-  })
-
-  it('should update multiple addresses simultaneously with P2WPKH address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const script1 = await providers.elliptic.script()
-
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const ownerAddress = await container.getNewAddress('', 'bech32')
-    const ownerAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, ownerAddress, P2WPKH)
-    const ownerAddressDestKeyHash = ownerAddressDest.pubKeyHash
-    const script2 = await fromAddress(ownerAddress, 'regtest')?.script as Script
-
-    const operatorAddress = await container.getNewAddress('', 'bech32')
-    const operatorAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress, P2WPKH)
-    const operatorAddressDestKeyHash = operatorAddressDest.pubKeyHash
-
-    const rewardAddress = await container.getNewAddress('', 'bech32')
-    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
-    const rewardAddressDestKeyHash = rewardAddressDest.pubKeyHash
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x04, addressPubKeyHash: ownerAddressDestKeyHash }
-        },
-        {
-          updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash }
-        },
-        {
-          updateType: 0x03,
-          address: { addressType: 0x04, addressPubKeyHash: rewardAddressDestKeyHash }
-        }
-      ]
-    }
-
-    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-    const collateralPrevout: Prevout = {
-      txid: masternodeId,
-      vout: 1,
-      script: script1,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVout: Vout = {
-      script: script2,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVin: Vin = {
-      txid: masternodeId,
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(3)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: 2,
-      scriptPubKey: {
-        addresses: [ownerAddress],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[2]).toStrictEqual({
-      n: 2,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[2].value).toBeGreaterThan(6.99)
-    expect(outs[2].value).toBeLessThan(7)
-  })
-
-  it('should update multiple addresses simultaneously with P2PKH address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const script1 = await providers.elliptic.script()
-
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const ownerAddress = await container.getNewAddress('', 'legacy')
-    const ownerAddressDest: P2PKH = P2PKH.fromAddress(RegTest, ownerAddress, P2PKH)
-    const ownerAddressDestHex = ownerAddressDest.hex
-    const script2 = await fromAddress(ownerAddress, 'regtest')?.script as Script
-
-    const operatorAddress = await container.getNewAddress('', 'legacy')
-    const operatorAddressDest: P2PKH = P2PKH.fromAddress(RegTest, operatorAddress, P2PKH)
-    const operatorAddressDestHex = operatorAddressDest.hex
-
-    const rewardAddress = await container.getNewAddress('', 'legacy')
-    const rewardAddressDest: P2PKH = P2PKH.fromAddress(RegTest, rewardAddress, P2PKH)
-    const rewardAddressDestHex = rewardAddressDest.hex
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x01, addressPubKeyHash: ownerAddressDestHex }
-        },
-        {
-          updateType: 0x02,
-          address: { addressType: 0x01, addressPubKeyHash: operatorAddressDestHex }
-        },
-        {
-          updateType: 0x03,
-          address: { addressType: 0x01, addressPubKeyHash: rewardAddressDestHex }
-        }
-      ]
-    }
-
-    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-    const collateralPrevout: Prevout = {
-      txid: masternodeId,
-      vout: 1,
-      script: script1,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVout: Vout = {
-      script: script2,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVin: Vin = {
-      txid: masternodeId,
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(3)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: 2,
-      scriptPubKey: {
-        addresses: [ownerAddress],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'pubkeyhash'
-      }
-    })
-    expect(outs[2]).toStrictEqual({
-      n: 2,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[2].value).toBeGreaterThan(6.99)
-    expect(outs[2].value).toBeLessThan(7)
-  })
-
-  it('should update remove reward address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const txid = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const rewardAddress = await container.getNewAddress('', 'bech32')
-    const rewardAddressDest: P2WPKH = P2WPKH.fromAddress(RegTest, rewardAddress, P2WPKH)
-    const rewardAddressDestKeyHash = rewardAddressDest.pubKeyHash
-
-    const setRewardAddressUpdate: UpdateMasternode = {
-      nodeId: txid,
-      updates: [
-        {
-          updateType: 0x03,
-          address: { addressType: 0x04, addressPubKeyHash: rewardAddressDestKeyHash }
-        }
-      ]
-    }
-
-    const script = await providers.elliptic.script()
-    const setRewardTxn: TransactionSegWit = await builder.masternode.update(setRewardAddressUpdate, script)
-    await sendTransaction(container, setRewardTxn)
-
-    await container.generate(50)
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: txid,
-      updates: [
-        {
-          updateType: 0x04,
-          address: { addressType: 0x00 }
-        }
-      ]
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const outs = await sendTransaction(container, txn)
-
-    const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-    const expectedRedeemScript = `6a${encoded}`
-
-    expect(outs.length).toStrictEqual(2)
-    expect(outs[0]).toStrictEqual({
-      n: 0,
-      tokenId: 0,
-      value: 0,
-      scriptPubKey: {
-        asm: expect.stringContaining('OP_RETURN 446654786d'),
-        hex: expectedRedeemScript,
-        type: 'nulldata'
-      }
-    })
-    expect(outs[1]).toStrictEqual({
-      n: 1,
-      tokenId: 0,
-      value: expect.any(Number),
-      scriptPubKey: {
-        addresses: [await providers.getAddress()],
-        asm: expect.any(String),
-        hex: expect.any(String),
-        reqSigs: 1,
-        type: 'witness_v0_keyhash'
-      }
-    })
-    expect(outs[1].value).toBeGreaterThan(6.99)
-    expect(outs[1].value).toBeLessThan(7)
-  })
-
-  it('should fail if address is P2SH', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(20)
-
-    const script = await providers.elliptic.script()
-
-    {
-      const address = await container.getNewAddress('', 'p2sh-segwit')
-      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-      const addressDestHex = addressDest.hex
-      const script2 = fromAddress(address, 'regtest')?.script as Script
-
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x01, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
-      }
-
-      const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-      const collateralPrevout: Prevout = {
-        txid: masternodeId,
-        vout: 1,
-        script: script,
-        value: new BigNumber(rawCollateralTx.vout[1].value),
-        tokenId: rawCollateralTx.vout[1].tokenId
-      }
-      const collateralVout: Vout = {
-        script: script2,
-        value: new BigNumber(rawCollateralTx.vout[1].value),
-        tokenId: rawCollateralTx.vout[1].tokenId
-      }
-      const collateralVin: Vin = {
-        txid: masternodeId,
-        index: 1,
-        script: { stack: [] },
-        sequence: 0xffffffff
-      }
-      const customVinVout = {
-        prevout: collateralPrevout,
-        vin: collateralVin,
-        vout: collateralVout
-      }
-
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script, [customVinVout])
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Owner address must be P2PKH or P2WPKH type (code 16)', code: -26")
-    }
-    {
-      const address = await container.getNewAddress('', 'p2sh-segwit')
-      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-      const addressDestHex = addressDest.hex
-
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
-      }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)', code: -26")
-    }
-    {
-      const address = await container.getNewAddress('', 'p2sh-segwit')
-      const addressDest: P2SH = P2SH.fromAddress(RegTest, address, P2SH)
-      const addressDestHex = addressDest.hex
-
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x03, address: { addressType: 0x02, addressPubKeyHash: addressDestHex } }]
-      }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)', code: -26")
-    }
-  })
-
-  it('should be failed as invalid address is not allowed', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-
-    await container.generate(20)
-
-    const script = await providers.elliptic.script()
-
-    {
-      const invalidAddress = 'INVALID_ADDRESS'
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x02, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
-      }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Operator address must be P2PKH or P2WPKH type (code 16)\', code: -26')
-    }
-
-    {
-      const invalidAddress = 'INVALID_ADDRESS'
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [{ updateType: 0x03, address: { addressType: 0x02, addressPubKeyHash: invalidAddress } }]
-      }
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Reward address must be P2PKH or P2WPKH type (code 16)\', code: -26')
-    }
-  })
-
-  it('should fail to update owner address without collateral transaction inputs', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-
-    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
-    await container.generate(20)
-
-    const address = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const promise = sendTransaction(container, txn)
-
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Missing previous collateral from transaction inputs (code 16)', code: -26")
-  })
-
-  it('should fail to update owner address with same address', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const script1 = await providers.elliptic.script()
-
-    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
-    await container.generate(20)
-
-    const newAddress = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-    const collateralPrevout: Prevout = {
-      txid: masternodeId,
-      vout: 1,
-      script: script1,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVout: Vout = {
-      script: script1,
-      value: new BigNumber(rawCollateralTx.vout[1].value),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVin: Vin = {
-      txid: masternodeId,
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
-    const promise = sendTransaction(container, txn)
-
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode with collateral address as operator or owner already exists (code 16)', code: -26")
-  })
-
-  it('should fail to update another node with operator address that is already used', async () => {
-    const pubKey1 = await providers.ellipticPair.publicKey()
-    const collateralAddress1 = Bech32.fromPubKey(pubKey1, 'bcrt')
-    const addressDest1: P2WPKH = P2WPKH.fromAddress(RegTest, collateralAddress1, P2WPKH)
-    const addressDestKeyHash1 = addressDest1.pubKeyHash
-
-    await jsonRpc.masternode.createMasternode(collateralAddress1)
-    await container.generate(20)
-
-    await providers.randomizeEllipticPair()
-    await providers.setupMocks()
-    const pubKey2 = await providers.ellipticPair.publicKey()
-    const collateralAddress2 = Bech32.fromPubKey(pubKey2, 'bcrt')
-
-    const masternodeId2 = await jsonRpc.masternode.createMasternode(collateralAddress2)
-    await container.generate(20)
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId2,
-      updates: [
-        {
-          updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash1 }
-        }
-      ]
-    }
-
-    const script = await providers.elliptic.script()
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-    const promise = sendTransaction(container, txn)
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode with that operator address already exists (code 16)', code: -26")
-  })
-
-  it('should fail with incorrect collateral amount', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const script1 = await providers.elliptic.script()
-
-    const initialAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(initialAddress)
-    await container.generate(20)
-
-    const newAddress = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, newAddress, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-    const script2 = await fromAddress(newAddress, 'regtest')?.script as Script
-
-    const updateMasternode: UpdateMasternode = {
-      nodeId: masternodeId,
-      updates: [
-        {
-          updateType: 0x01,
-          address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-        }
-      ]
-    }
-
-    const rawCollateralTx = await jsonRpc.rawtx.getRawTransaction(masternodeId, true)
-    const collateralPrevout: Prevout = {
-      txid: masternodeId,
-      vout: 1,
-      script: script1,
-      value: new BigNumber(5),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVout: Vout = {
-      script: script2,
-      value: new BigNumber(5),
-      tokenId: rawCollateralTx.vout[1].tokenId
-    }
-    const collateralVin: Vin = {
-      txid: masternodeId,
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script1, [customVinVout])
-    const promise = sendTransaction(container, txn)
-
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: Incorrect collateral amount (code 16)\', code: -26')
-  })
-
-  it('should not update masternode while in PRE_ENABLED or TRANSFERRING state', async () => {
-    const pubKey = await providers.ellipticPair.publicKey()
-    const script = await providers.elliptic.script()
-    const collateralAddress = Bech32.fromPubKey(pubKey, 'bcrt')
-    const masternodeId = await jsonRpc.masternode.createMasternode(collateralAddress)
-    await container.generate(1)
-
-    {
-      const masternodes = await jsonRpc.masternode.listMasternodes()
-      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
-        state: 'PRE_ENABLED',
-        ownerAuthAddress: collateralAddress
-      }))
-    }
-
-    const address = await container.getNewAddress('', 'bech32')
-    const addressDest: P2WPKH = P2WPKH.fromAddress(RegTest, address, P2WPKH)
-    const addressDestKeyHash = addressDest.pubKeyHash
-
-    {
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [
-          {
-            updateType: 0x02,
-            address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-          }
-        ]
-      }
-
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const promise = sendTransaction(container, txn)
-      await expect(promise).rejects.toThrow(DeFiDRpcError)
-      await expect(promise).rejects.toThrow(`DeFiDRpcError: 'bad-txns-customtx, UpdateMasternodeTx: Masternode ${masternodeId} is not in 'ENABLED' state (code 16)', code: -26`)
-    }
-
-    await container.generate(20)
-
-    {
-      const masternodes = await jsonRpc.masternode.listMasternodes()
-      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
-        state: 'ENABLED',
-        ownerAuthAddress: collateralAddress
-      }))
-    }
-
-    {
-      const updateMasternode: UpdateMasternode = {
-        nodeId: masternodeId,
-        updates: [
-          {
-            updateType: 0x02,
-            address: { addressType: 0x04, addressPubKeyHash: addressDestKeyHash }
-          }
-        ]
-      }
-
-      const txn: TransactionSegWit = await builder.masternode.update(updateMasternode, script)
-      const outs = await sendTransaction(container, txn)
-
-      const encoded: string = OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode).asBuffer().toString('hex')
-      const expectedRedeemScript = `6a${encoded}`
-      expect(outs.length).toStrictEqual(2)
-      expect(outs[0].scriptPubKey.hex).toStrictEqual(expectedRedeemScript)
-    }
-
-    {
-      const masternodes = await jsonRpc.masternode.listMasternodes()
-      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
-        state: 'TRANSFERRING',
-        ownerAuthAddress: collateralAddress
-      }))
-    }
-
-    await container.generate(45)
-
-    {
-      const masternodes = await jsonRpc.masternode.listMasternodes()
-      expect(masternodes[masternodeId]).toStrictEqual(expect.objectContaining({
-        state: 'ENABLED',
-        ownerAuthAddress: collateralAddress
-      }))
-    }
-  })
-})
-
-describe('Update Masternode (Multi-containers)', () => {
-  let tGroup: TestingGroup
-  const node: Testing[] = []
-  let builderNode1: P2WPKHTransactionBuilder
-  let providersNode1: MockProviders
-
-  beforeAll(async () => {
-    tGroup = TestingGroup.create(2, i => new MasterNodeRegTestContainer(RegTestFoundationKeys[i]))
-    await tGroup.start()
-    node.push(tGroup.get(0))
-    node.push(tGroup.get(1))
-    await node[0].container.waitForWalletCoinbaseMaturity()
-    await node[0].container.waitForWalletBalanceGTE(1000)
-    providersNode1 = await getProviders(node[1].container)
-
-    await providersNode1.randomizeEllipticPair()
-    builderNode1 = new P2WPKHTransactionBuilder(providersNode1.fee, providersNode1.prevout, providersNode1.elliptic, RegTest)
-    await fundEllipticPair(node[1].container, providersNode1.ellipticPair, 10)
-    await providersNode1.setupMocks()
-
-    await node[0].container.generate(1)
-    await node[1].container.generate(1)
-  })
-
-  afterAll(async () => {
-    await tGroup.stop()
-  })
-
-  it('should throw error if incorrect authorization is provided', async () => {
-    await node[0].container.waitForWalletCoinbaseMaturity()
-    await node[1].container.waitForWalletCoinbaseMaturity()
-
-    // enable updating
-    await node[0].rpc.masternode.setGov({
-      ATTRIBUTES: {
-        'v0/params/feature/mn-setowneraddress': 'true',
-        'v0/params/feature/mn-setoperatoraddress': 'true',
-        'v0/params/feature/mn-setrewardaddress': 'true'
-      }
-    })
-    await node[0].generate(1)
-
-    const masternodeOwnerAddress0 = await node[0].rpc.wallet.getNewAddress()
-    const masternodeId0 = await node[0].rpc.masternode.createMasternode(masternodeOwnerAddress0)
-    await node[0].generate(100) // create masternode and wait for it to be enabled
-
-    const operatorAddress0 = await node[0].rpc.wallet.getNewAddress()
-    const operatorAddressDest0: P2WPKH = P2WPKH.fromAddress(RegTest, operatorAddress0, P2WPKH)
-    const operatorAddressDestKeyHash0 = operatorAddressDest0.pubKeyHash
-    const operatorScript = await fromAddress(operatorAddress0, 'regtest')?.script as Script
-    await node[0].generate(4)
-    await tGroup.waitForSync() // container2 should know about the new masternode
-
-    const updateMasternode0: UpdateMasternode = {
-      nodeId: masternodeId0,
-      updates: [
-        {
-          updateType: 0x02,
-          address: { addressType: 0x04, addressPubKeyHash: operatorAddressDestKeyHash0 }
-        }
-      ]
-    }
-    const txn: TransactionSegWit = await builderNode1.masternode.update(updateMasternode0, operatorScript)
-    const promise = sendTransaction(node[1].container, txn)
-
-    await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow('DeFiDRpcError: \'bad-txns-customtx, UpdateMasternodeTx: tx must have at least one input from the owner (code 16)\', code: -26')
-  })
-})
diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
index e6d8da354a..6e0740cad4 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_p2wpkh.test.ts
@@ -1,9 +1,9 @@
 import BigNumber from 'bignumber.js'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
-import { P2WPKHTxnBuilder, Prevout } from '../../src'
+import { P2WPKHTxnBuilder } from '../../src'
 import { fundEllipticPair } from '../test.utils'
-import { CDfTx, DeFiOpUnmapped, OP_CODES, OP_DEFI_TX, Vin, Vout } from '@defichain/jellyfish-transaction'
+import { CDfTx, DeFiOpUnmapped, OP_CODES, OP_DEFI_TX } from '@defichain/jellyfish-transaction'
 import { RegTest } from '@defichain/jellyfish-network'
 
 // P2WPKHTxnBuilder is abstract and not instantiable
@@ -92,46 +92,4 @@ describe('createDeFiTx()', () => {
     expect(result.vout[1].value.gt(new BigNumber(99.999).minus(spendAmount))).toBeTruthy()
     expect(result.vout[1].value.lt(new BigNumber(100).minus(spendAmount))).toBeTruthy()
   })
-
-  it('should create DfTx stack correctly with custom vin and vout', async () => {
-    const script = await providers.elliptic.script()
-
-    const collateralPrevout: Prevout = {
-      txid: '1111111122222222333333334444444455555555666666667777777788888888',
-      vout: 0,
-      script: script,
-      value: new BigNumber(15),
-      tokenId: 0
-    }
-    const collateralVout: Vout = {
-      script: script,
-      value: new BigNumber(15),
-      tokenId: 0
-    }
-    const collateralVin: Vin = {
-      txid: '1111111122222222333333334444444455555555666666667777777788888888',
-      index: 1,
-      script: { stack: [] },
-      sequence: 0xffffffff
-    }
-    const customVinVout = {
-      prevout: collateralPrevout,
-      vin: collateralVin,
-      vout: collateralVout
-    }
-
-    const result = await builder.createDeFiTx(dummyDfTx, script, undefined, [customVinVout])
-
-    expect(result.vin.length).toStrictEqual(8)
-    expect(result.vout.length).toStrictEqual(3)
-
-    expect(result.vout[0].value).toStrictEqual(new BigNumber(0))
-    expect(result.vout[1]).toStrictEqual(expect.objectContaining({
-      value: new BigNumber(15),
-      script: script
-    }))
-    expect(result.vout[2].value.gt(99.999)).toBeTruthy()
-    expect(result.vout[2].value.lt(100)).toBeTruthy()
-    expect(result.vout[2].script).toStrictEqual(script)
-  })
 })
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index 3289e2e397..90300bb787 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -89,8 +89,6 @@ export abstract class P2WPKHTxnBuilder {
    * Craft a transaction with OP_DEFI_TX from the output of OP_CODES.OP_DEFI_TX_.
    * This is a helper method for creating custom defi transactions.
    *
-   * Optionally, allow for custom inputs with vin and vout.
-   *
    * As DeFi custom transaction will always require small amount of DFI,
    * collectPrevouts() is set to search for at least 0.001 DFI amount of prevout.
    * This will also evidently merge small prevout during the operation.
@@ -100,21 +98,15 @@ export abstract class P2WPKHTxnBuilder {
    * @param {OP_DEFI_TX} opDeFiTx to create
    * @param {Script} changeScript to send unspent to after deducting the fees
    * @param {BigNumber} [outValue=0] for the opDeFiTx, usually always be 0.
-   * @param {Array<{ vin: Vin, vout: Vout, prevout: Prevout }>} [customVinVout = []] for custom vin and vout
    */
   async createDeFiTx (
     opDeFiTx: OP_DEFI_TX,
     changeScript: Script,
-    outValue: BigNumber = new BigNumber('0'),
-    customVinVout: Array<{ vin: Vin, vout: Vout, prevout: Prevout }> = []
+    outValue: BigNumber = new BigNumber('0')
   ): Promise<TransactionSegWit> {
     const minFee = outValue.plus(0.001) // see JSDoc above
     const { prevouts, vin, total } = await this.collectPrevouts(minFee)
 
-    const customVins = customVinVout.map(({ vin }) => vin)
-    const customPrevouts = customVinVout.map(({ prevout }) => prevout)
-    const customVouts = customVinVout.map(({ vout }) => vout)
-
     const deFiOut: Vout = {
       value: outValue,
       script: {
@@ -131,15 +123,15 @@ export abstract class P2WPKHTxnBuilder {
 
     const txn: Transaction = {
       version: DeFiTransactionConstants.Version,
-      vin: [...vin, ...customVins],
-      vout: [deFiOut, ...customVouts, change],
+      vin: vin,
+      vout: [deFiOut, change],
       lockTime: 0x00000000
     }
 
     const fee = await this.calculateFee(txn)
     change.value = total.minus(outValue).minus(fee)
 
-    return await this.sign(txn, [...prevouts, ...customPrevouts])
+    return await this.sign(txn, prevouts)
   }
 
   /**
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
index 31ce6d684e..b689cc758f 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_masternode.ts
@@ -4,12 +4,8 @@ import {
   OP_CODES,
   ResignMasternode,
   Script,
-  TransactionSegWit,
-  UpdateMasternode,
-  Vin,
-  Vout
+  TransactionSegWit
 } from '@defichain/jellyfish-transaction'
-import { Prevout } from '..'
 import { P2WPKHTxnBuilder } from './txn_builder'
 
 export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
@@ -45,25 +41,4 @@ export class TxnBuilderMasternode extends P2WPKHTxnBuilder {
       changeScript
     )
   }
-
-  /**
-   * Build update masternode transaction
-   *
-   * @param {UpdateMasternode} updateMasternode transaction to create
-   * @param {Script} changeScript to send unspent to after deducting the (converted + fees)
-   * @param {Array<{ vin: Vin, vout: Vout, prevout: Prevout }>} [customVinVout = []] for custom vin and vout when updating owner address
-   * @return {Promise<TransactionSegWit>}
-   */
-  async update (
-    updateMasternode: UpdateMasternode,
-    changeScript: Script,
-    customVinVout?: Array<{ vin: Vin, vout: Vout, prevout: Prevout }>
-  ): Promise<TransactionSegWit> {
-    return await this.createDeFiTx(
-      OP_CODES.OP_DEFI_TX_UPDATE_MASTER_NODE(updateMasternode),
-      changeScript,
-      undefined,
-      customVinVout
-    )
-  }
 }