Merge pull request #884 from ava-labs/feat/convertSubnetTx-fixes

fix/convertsubnettx type fixes

src/fixtures/pvm.ts

@@ -29,8 +29,6 @@ import {
   transferableOutputBytes,
 } from './avax';
 import {
-  address,
-  addressBytes,
   addresses,
   addressesBytes,
   id,
@@ -309,7 +307,7 @@ export const transformSubnetTxBytes = () =>
 
 export const convertSubnetValidator = () =>
   new ConvertSubnetValidator(
-    nodeId(),
+    bytes(),
     bigIntPr(),
     bigIntPr(),
     proofOfPossession(),
@@ -319,7 +317,7 @@ export const convertSubnetValidator = () =>
 
 export const convertSubnetValidatorBytes = () =>
   concatBytes(
-    nodeIdBytes(),
+    bytesBytes(),
     bigIntPrBytes(),
     bigIntPrBytes(),
     proofOfPossessionBytes(),
@@ -332,7 +330,7 @@ export const convertSubnetTx = () =>
     baseTx(),
     id(),
     id(),
-    address(),
+    bytes(),
     makeList(convertSubnetValidator)(),
     input(),
   );
@@ -342,8 +340,9 @@ export const convertSubnetTxBytes = () =>
     baseTxbytes(),
     idBytes(),
     idBytes(),
-    addressBytes(),
+    bytesBytes(),
     makeListBytes(convertSubnetValidatorBytes)(),
+    bytesForInt(10),
     inputBytes(),
   );
 

src/fixtures/utils/serializable.ts

@@ -22,10 +22,6 @@ export const testSerialization = (
 
   describe(name, () => {
     it('serializes correctly', () => {
-      if (name === 'ConvertSubnetTx') {
-        console.log('a', entityFixture().toBytes(codec()));
-        console.log('b', bytesFixture());
-      }
       expect(entityFixture().toBytes(codec())).toStrictEqual(bytesFixture());
     });
   });

src/serializable/codec/codec.ts

@@ -37,7 +37,6 @@ export class Codec {
   UnpackPrefix = <T extends Serializable>(buf: Uint8Array): [T, Uint8Array] => {
     let typeId: Int;
     [typeId, buf] = unpack(buf, [Int]);
-    console.log('typeId', typeId, this.typeIdToType);
     const type = this.typeIdToType[typeId.value()];
 
     if (type === undefined) {

src/serializable/fxs/pvm/convertSubnetValidator.ts

@@ -1,12 +1,12 @@
 import { pack, unpack } from '../../../utils/struct';
 import type { Codec } from '../../codec/codec';
 import { serializable } from '../../common/types';
-import { NodeId } from '../common/nodeId';
-import { BigIntPr } from '../../primitives';
+import { BigIntPr, Bytes } from '../../primitives';
 import { TypeSymbols } from '../../constants';
 import { ProofOfPossession } from '../../pvm/proofOfPossession';
 import { PChainOwner } from './pChainOwner';
 import { emptyNodeId } from '../../../constants/zeroValue';
+import { NodeId } from '../common';
 
 /**
  * @see https://github.com/ava-labs/avalanchego/blob/master/vms/platformvm/txs/convert_subnet_tx.go#86
@@ -16,7 +16,7 @@ export class ConvertSubnetValidator {
   _type = TypeSymbols.ConvertSubnetValidator;
 
   constructor(
-    public readonly nodeId: NodeId,
+    public readonly nodeId: Bytes,
     public readonly weight: BigIntPr,
     public readonly balance: BigIntPr,
     public readonly signer: ProofOfPossession,
@@ -38,7 +38,7 @@ export class ConvertSubnetValidator {
       rest,
     ] = unpack(
       bytes,
-      [NodeId, BigIntPr, BigIntPr, ProofOfPossession, PChainOwner, PChainOwner],
+      [Bytes, BigIntPr, BigIntPr, ProofOfPossession, PChainOwner, PChainOwner],
       codec,
     );
 
@@ -78,7 +78,9 @@ export class ConvertSubnetValidator {
       throw new Error('Weight must be greater than 0');
     }
 
-    if (this.nodeId === emptyNodeId) {
+    const nodeId = new NodeId(this.nodeId.toBytesWithoutLength());
+
+    if (nodeId === emptyNodeId) {
       throw new Error('Node ID must be non-empty');
     }
     return true;

src/serializable/fxs/pvm/pChainOwner.ts

@@ -1,5 +1,5 @@
 import { concatBytes } from '@noble/hashes/utils';
-import { packList, toListStruct } from '../../../utils/serializeList';
+import { toListStruct } from '../../../utils/serializeList';
 import { pack, unpack } from '../../../utils/struct';
 import { serializable } from '../../common/types';
 import { Int } from '../../primitives';
@@ -29,9 +29,6 @@ export class PChainOwner {
   }
 
   toBytes(codec: Codec) {
-    return concatBytes(
-      pack([this.threshold, this.addresses], codec),
-      // packList(this.addresses, codec),
-    );
+    return concatBytes(pack([this.threshold, this.addresses], codec));
   }
 }

src/serializable/primitives/bytes.ts

@@ -34,6 +34,10 @@ export class Bytes extends Primitives {
     return concatBytes(bytesForInt(this.bytes.length), this.bytes);
   }
 
+  toBytesWithoutLength() {
+    return this.bytes;
+  }
+
   /**
    * Returns the length of the bytes (Uint8Array).
    *

src/serializable/pvm/codec.ts

@@ -18,7 +18,7 @@ import { RemoveSubnetValidatorTx } from './removeSubnetValidatorTx';
 import { TransferSubnetOwnershipTx } from './transferSubnetOwnershipTx';
 import { TransformSubnetTx } from './transformSubnetTx';
 import { BaseTx } from './baseTx';
-import { ConvertSubnetValidator } from '../fxs/pvm/convertSubnetValidator';
+import { ConvertSubnetTx } from './convertSubnetTx';
 
 /**
  * @see https://github.com/ava-labs/avalanchego/blob/master/vms/platformvm/txs/codec.go#L35
@@ -59,7 +59,7 @@ export const codec = new Codec([
   TransferSubnetOwnershipTx, // 33
   BaseTx, // 34
 
-  ConvertSubnetValidator, // 35
+  ConvertSubnetTx, // 35
 ]);
 
 let manager: Manager;

src/serializable/pvm/convertSubnetTx.ts

@@ -6,9 +6,9 @@ import { Codec } from '../codec/codec';
 import type { Serializable } from '../common/types';
 import { serializable } from '../common/types';
 import { TypeSymbols } from '../constants';
-import { Address } from '../fxs/common';
 import { Id } from '../fxs/common';
 import { ConvertSubnetValidator } from '../fxs/pvm/convertSubnetValidator';
+import { Bytes } from '../primitives/bytes';
 import { AbstractSubnetTx } from './abstractSubnetTx';
 
 @serializable()
@@ -19,7 +19,7 @@ export class ConvertSubnetTx extends AbstractSubnetTx {
     public readonly baseTx: BaseTx,
     public readonly subnetID: Id,
     public readonly chainID: Id,
-    public readonly address: Address,
+    public readonly address: Bytes,
     public readonly validators: ConvertSubnetValidator[],
     public readonly subnetAuth: Serializable,
   ) {
@@ -37,7 +37,7 @@ export class ConvertSubnetTx extends AbstractSubnetTx {
     const [baseTx, subnetID, chainID, address, validators, subnetAuth, rest] =
       unpack(
         bytes,
-        [BaseTx, Id, Id, Address, toListStruct(ConvertSubnetValidator), Codec],
+        [BaseTx, Id, Id, Bytes, toListStruct(ConvertSubnetValidator), Codec],
         codec,
       );
     return [