make codec required, some pvm types (#89)

* wip

* xchain

* rename to avm

* nits

* wip

* wip

* add test

* refactor type

src/common/types.ts

@@ -3,13 +3,12 @@ import type { Codec } from '../codec';
 export interface Serializable {
   _type: symbol;
 
-  toBytes(codec?: Codec): Uint8Array;
+  toBytes(codec: Codec): Uint8Array;
 }
 
 export interface SerializableStatic {
   new (...args: any[]): Serializable;
 
-  fromBytes(bytes: Uint8Array, codec?: Codec): [Serializable, Uint8Array];
   fromBytes(bytes: Uint8Array, codec: Codec): [Serializable, Uint8Array];
 }
 

src/components/avax/baseTx.ts

@@ -1,11 +1,11 @@
-import { concatBytes } from '../../utils/buffer';
 import type { Codec } from '../../codec/codec';
 import { serializable } from '../../common/types';
 import { TransferableInput, TransferableOutput } from '../../components/avax';
 import { Id } from '../../fxs/common/id';
 import { Bytes, Int } from '../../primitives';
+import { concatBytes } from '../../utils/buffer';
 import { convertListStruct, packList } from '../../utils/serializeList';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.BaseTx');
 
@@ -45,7 +45,7 @@ export class BaseTx {
 
   toBytes(codec) {
     return concatBytes(
-      packSimple(this.NetworkId, this.BlockchainId),
+      pack([this.NetworkId, this.BlockchainId], codec),
       packList(this.outputs, codec),
       packList(this.inputs, codec),
       this.memo.toBytes(),

src/components/avax/transferableInput.ts

@@ -4,7 +4,7 @@ import type { Serializable } from '../../common/types';
 import { serializable } from '../../common/types';
 import { Id } from '../../fxs/common/id';
 import { concatBytes } from '../../utils/buffer';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.TransferableInput');
 
@@ -38,7 +38,7 @@ export class TransferableInput {
 
   toBytes(codec: Codec) {
     return concatBytes(
-      packSimple(this.utxoID, this.assetId),
+      pack([this.utxoID, this.assetId], codec),
       codec.PackPrefix(this.input),
     );
   }

src/components/avax/transferableOp.ts

@@ -1,11 +1,11 @@
-import { concatBytes } from '../../utils/buffer';
 import { UTXOID } from '.';
 import { Codec } from '../../codec/codec';
 import type { Serializable } from '../../common/types';
 import { serializable } from '../../common/types';
 import { Id } from '../../fxs/common/id';
+import { concatBytes } from '../../utils/buffer';
 import { convertListStruct, packList } from '../../utils/serializeList';
-import { packSimpleWithCodec, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.TransferableOp');
 
@@ -37,8 +37,8 @@ export class TransferableOp {
 
   toBytes(codec: Codec) {
     return concatBytes(
-      packSimpleWithCodec([this.assetId], codec),
-      packList(this.UTXOId),
+      pack([this.assetId], codec),
+      packList(this.UTXOId, codec),
       codec.PackPrefix(this.transferOp),
     );
   }

src/components/avax/transferableOutput.ts

@@ -3,7 +3,7 @@ import type { Amounter } from '../../common/types';
 import { serializable } from '../../common/types';
 import { Id } from '../../fxs/common/id';
 import { concatBytes } from '../../utils/buffer';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.TransferableOutput');
 
@@ -29,6 +29,9 @@ export class TransferableOutput {
   }
 
   toBytes(codec: Codec) {
-    return concatBytes(packSimple(this.assetId), codec.PackPrefix(this.output));
+    return concatBytes(
+      pack([this.assetId], codec),
+      codec.PackPrefix(this.output),
+    );
   }
 }

src/components/avax/utxo.ts

@@ -3,7 +3,7 @@ import { Codec } from '../../codec/codec';
 import { Serializable, serializable } from '../../common/types';
 import { UTXOID } from '../../components/avax';
 import { Id } from '../../fxs/common';
-import { packSimpleWithCodec, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.Utxo');
 
@@ -31,7 +31,7 @@ export class Utxo {
 
   toBytes(codec) {
     return concatBytes(
-      packSimpleWithCodec([this.utxoId, this.assetId], codec),
+      pack([this.utxoId, this.assetId], codec),
       codec.PackPrefix(this.output),
     );
   }

src/components/avax/utxoId.ts

@@ -4,7 +4,7 @@ import { Id } from '../../fxs/common/id';
 import { BigIntPr, Int } from '../../primitives';
 import { base58check } from '../../utils/base58';
 import { concatBytes } from '../../utils/buffer';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('avax.UTXOID');
 
@@ -23,8 +23,8 @@ export class UTXOID {
     return [new UTXOID(txID, outputIdx), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.txID, this.outputIdx);
+  toBytes(codec) {
+    return pack([this.txID, this.outputIdx], codec);
   }
 
   ID() {

src/fxs/nft/mintOperation.ts

@@ -1,7 +1,7 @@
 import { serializable } from '../../common/types';
 import { Bytes, Int } from '../../primitives';
+import { pack, unpack } from '../../utils/struct';
 import { Input, OutputOwnersList } from '../secp256k1';
-import { packSimple, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('nftfx.MintOperation');
 
@@ -30,12 +30,10 @@ export class MintOperation {
     ];
   }
 
-  toBytes() {
-    return packSimple(
-      this.input,
-      this.groupId,
-      this.payload,
-      this.outputOwnerList,
+  toBytes(codec) {
+    return pack(
+      [this.input, this.groupId, this.payload, this.outputOwnerList],
+      codec,
     );
   }
 }

src/fxs/nft/mintOutput.ts

@@ -1,6 +1,6 @@
 import { serializable } from '../../common/types';
 import { Int } from '../../primitives';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 import { OutputOwners } from '../secp256k1';
 
 const _symbol = Symbol('nftfx.MintOutput');
@@ -15,16 +15,17 @@ export class MintOutput {
 
   constructor(private groupId: Int, private outputOwners: OutputOwners) {}
 
-  static fromBytes(bytes: Uint8Array): [MintOutput, Uint8Array] {
-    const [groupId, owners, remaining] = unpack(bytes, [
-      Int,
-      OutputOwners,
-    ] as const);
+  static fromBytes(bytes: Uint8Array, codec): [MintOutput, Uint8Array] {
+    const [groupId, owners, remaining] = unpack(
+      bytes,
+      [Int, OutputOwners] as const,
+      codec,
+    );
 
     return [new MintOutput(groupId, owners), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.groupId, this.outputOwners);
+  toBytes(codec) {
+    return pack([this.groupId, this.outputOwners], codec);
   }
 }

src/fxs/nft/transferOperation.ts

@@ -1,5 +1,5 @@
 import { serializable } from '../../common/types';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 import { Input } from '../secp256k1';
 import { TransferOutput } from './transferOutput';
 
@@ -21,7 +21,7 @@ export class TransferOperation {
     return [new TransferOperation(input, output), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.input, this.output);
+  toBytes(codec) {
+    return pack([this.input, this.output], codec);
   }
 }

src/fxs/nft/transferOutput.ts

@@ -1,6 +1,6 @@
 import { serializable } from '../../common/types';
 import { Bytes, Int } from '../../primitives';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 import { OutputOwners } from '../secp256k1';
 
 const _symbol = Symbol('nftfx.TransferOutput');
@@ -29,7 +29,7 @@ export class TransferOutput {
     return [new TransferOutput(groupId, payload, outputOwners), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.groupId, this.payload, this.outputOwners);
+  toBytes(codec) {
+    return pack([this.groupId, this.payload, this.outputOwners], codec);
   }
 }

src/fxs/secp256k1/credential.ts

@@ -1,3 +1,4 @@
+import { Codec } from '../../codec';
 import { serializable } from '../../common/types';
 import { packList, unpackList } from '../../utils/serializeList';
 import { Signature } from './signature';
@@ -13,12 +14,12 @@ export class Credential {
 
   constructor(private signatures: Signature[]) {}
 
-  static fromBytes(bytes: Uint8Array): [Credential, Uint8Array] {
-    const [sigs, remaining] = unpackList(bytes, Signature);
+  static fromBytes(bytes: Uint8Array, codec: Codec): [Credential, Uint8Array] {
+    const [sigs, remaining] = unpackList(bytes, Signature, codec);
     return [new Credential(sigs), remaining];
   }
 
-  toBytes() {
-    return packList(this.signatures);
+  toBytes(codec) {
+    return packList(this.signatures, codec);
   }
 }

src/fxs/secp256k1/input.ts

@@ -22,7 +22,7 @@ export class Input {
     return [new Input(sigIndices), remaining];
   }
 
-  toBytes() {
-    return packList(this.sigIndices);
+  toBytes(codec) {
+    return packList(this.sigIndices, codec);
   }
 }

src/fxs/secp256k1/mintOperation.ts

@@ -29,11 +29,11 @@ export class MintOperation {
     return [new MintOperation(input, mintOutput, transferOutput), remaining];
   }
 
-  toBytes() {
+  toBytes(codec) {
     return concatBytes(
-      this.input.toBytes(),
-      this.mintOutput.toBytes(),
-      this.transferOutput.toBytes(),
+      this.input.toBytes(codec),
+      this.mintOutput.toBytes(codec),
+      this.transferOutput.toBytes(codec),
     );
   }
 }

src/fxs/secp256k1/mintOutput.ts

@@ -13,14 +13,14 @@ export class MintOutput {
 
   constructor(private outputOwners: OutputOwners) {}
 
-  static fromBytes(bytes: Uint8Array): [MintOutput, Uint8Array] {
+  static fromBytes(bytes: Uint8Array, codec): [MintOutput, Uint8Array] {
     let owners: OutputOwners;
-    [owners, bytes] = OutputOwners.fromBytes(bytes);
+    [owners, bytes] = OutputOwners.fromBytes(bytes, codec);
 
     return [new MintOutput(owners), bytes];
   }
 
-  toBytes() {
-    return this.outputOwners.toBytes();
+  toBytes(codec) {
+    return this.outputOwners.toBytes(codec);
   }
 }

src/fxs/secp256k1/outputOwners.ts

@@ -2,7 +2,7 @@ import { concatBytes } from '@noble/hashes/utils';
 import { serializable } from '../../common/types';
 import { BigIntPr, Int } from '../../primitives';
 import { convertListStruct, packList } from '../../utils/serializeList';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 import { Address } from '../common';
 
 const _symbol = Symbol('secp256k1fx.OutputOwners');
@@ -21,20 +21,20 @@ export class OutputOwners {
     public readonly addrs: Address[],
   ) {}
 
-  static fromBytes(bytes: Uint8Array): [OutputOwners, Uint8Array] {
-    const [locktime, threshold, addresses, remaining] = unpack(bytes, [
-      BigIntPr,
-      Int,
-      convertListStruct(Address),
-    ]);
+  static fromBytes(bytes: Uint8Array, codec): [OutputOwners, Uint8Array] {
+    const [locktime, threshold, addresses, remaining] = unpack(
+      bytes,
+      [BigIntPr, Int, convertListStruct(Address)],
+      codec,
+    );
 
     return [new OutputOwners(locktime, threshold, addresses), remaining];
   }
 
-  toBytes() {
+  toBytes(codec) {
     return concatBytes(
-      packSimple(this.locktime, this.threshold),
-      packList(this.addrs),
+      pack([this.locktime, this.threshold], codec),
+      packList(this.addrs, codec),
     );
   }
 }

src/fxs/secp256k1/outputOwnersList.ts

@@ -14,12 +14,12 @@ export class OutputOwnersList {
 
   constructor(private outputOwners: OutputOwners[]) {}
 
-  static fromBytes(bytes: Uint8Array): [OutputOwnersList, Uint8Array] {
-    const [owners, remaining] = unpackList(bytes, OutputOwners);
+  static fromBytes(bytes: Uint8Array, codec): [OutputOwnersList, Uint8Array] {
+    const [owners, remaining] = unpackList(bytes, OutputOwners, codec);
     return [new OutputOwnersList(owners), remaining];
   }
 
-  toBytes() {
-    return packList(this.outputOwners);
+  toBytes(codec) {
+    return packList(this.outputOwners, codec);
   }
 }

src/fxs/secp256k1/transferInput.ts

@@ -1,7 +1,7 @@
 import { Input } from '.';
 import { serializable } from '../../common/types';
 import { BigIntPr } from '../../primitives';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('secp256k1fx.TransferInput');
 
@@ -22,7 +22,7 @@ export class TransferInput {
     return [new TransferInput(amt, input), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.amt, this.input);
+  toBytes(codec) {
+    return pack([this.amt, this.input], codec);
   }
 }

src/fxs/secp256k1/transferOutput.ts

@@ -1,7 +1,7 @@
 import { OutputOwners } from '.';
 import { serializable } from '../../common/types';
 import { BigIntPr } from '../../primitives';
-import { packSimple, unpack } from '../../utils/struct';
+import { pack, unpack } from '../../utils/struct';
 
 const _symbol = Symbol('secp256k1fx.TransferOutput');
 
@@ -30,7 +30,7 @@ export class TransferOutput {
     return [new TransferOutput(amt, owners), remaining];
   }
 
-  toBytes() {
-    return packSimple(this.amt, this.outputOwners);
+  toBytes(codec) {
+    return pack([this.amt, this.outputOwners], codec);
   }
 }