feat: (pvm, avm, info) CP-9758 cleanup. WIP

examples/p-chain/base.ts

@@ -1,29 +1,41 @@
-import { addTxSignatures } from '../../src/signer';
-import { TransferableOutput } from '../../src/serializable/avax';
-import { bech32ToBytes, hexToBuffer } from '../../src/utils';
-import { getContextFromURI } from '../../src/vms/context';
-import { newBaseTx } from '../../src/vms/pvm';
-import { pvmapi } from '../chain_apis';
+import { TransferableOutput, addTxSignatures, pvm, utils } from '../../src';
 import { getEnvVars } from '../utils/getEnvVars';
+import { setupEtnaExample } from './utils/etna-helper';
+
+/**
+ * The amount of AVAX to send to self.
+ */
+const SEND_AVAX_AMOUNT: number = 0.001;
 
 const main = async () => {
   const { AVAX_PUBLIC_URL, P_CHAIN_ADDRESS, PRIVATE_KEY } = getEnvVars();
 
-  const { utxos } = await pvmapi.getUTXOs({ addresses: [P_CHAIN_ADDRESS] });
-  const context = await getContextFromURI(AVAX_PUBLIC_URL);
+  const { context, feeState, pvmApi } = await setupEtnaExample(AVAX_PUBLIC_URL);
+
+  const { utxos } = await pvmApi.getUTXOs({ addresses: [P_CHAIN_ADDRESS] });
 
-  const tx = newBaseTx(context, [bech32ToBytes(P_CHAIN_ADDRESS)], utxos, [
-    TransferableOutput.fromNative(context.avaxAssetID, BigInt(0.1 * 1e9), [
-      bech32ToBytes(P_CHAIN_ADDRESS),
-    ]),
-  ]);
+  const tx = pvm.newBaseTx(
+    {
+      feeState,
+      fromAddressesBytes: [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
+      outputs: [
+        TransferableOutput.fromNative(
+          context.avaxAssetID,
+          BigInt(SEND_AVAX_AMOUNT * 1e9),
+          [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
+        ),
+      ],
+      utxos,
+    },
+    context,
+  );
 
   await addTxSignatures({
     unsignedTx: tx,
-    privateKeys: [hexToBuffer(PRIVATE_KEY)],
+    privateKeys: [utils.hexToBuffer(PRIVATE_KEY)],
   });
 
-  return pvmapi.issueSignedTx(tx.getSignedTx());
+  return pvmApi.issueSignedTx(tx.getSignedTx());
 };
 
 main().then(console.log);

examples/p-chain/etna/convertSubnetToL1.ts → examples/p-chain/convertSubnetToL1.ts

@@ -5,9 +5,9 @@ import {
   pvm,
   pvmSerial,
   utils,
-} from '../../../src';
+} from '../../src';
 import { setupEtnaExample } from './utils/etna-helper';
-import { getEnvVars } from '../../utils/getEnvVars';
+import { getEnvVars } from '../utils/getEnvVars';
 
 const AMOUNT_TO_VALIDATE_AVAX: number = 1;
 const BALANCE_AVAX: number = 1;
@@ -56,7 +56,7 @@ const convertSubnetToL1TxExample = async () => {
     pChainOwner,
   );
 
-  const tx = pvm.e.newConvertSubnetToL1Tx(
+  const tx = pvm.newConvertSubnetToL1Tx(
     {
       feeState,
       fromAddressesBytes: [testPAddr],

examples/p-chain/etna/createChain.ts → examples/p-chain/createChain.ts

@@ -1,7 +1,7 @@
-import { pvm, utils } from '../../../src';
+import { pvm, utils } from '../../src';
 import { setupEtnaExample } from './utils/etna-helper';
-import { testGenesisData } from '../../../src/fixtures/transactions';
-import { getEnvVars } from '../../utils/getEnvVars';
+import { testGenesisData } from '../../src/fixtures/transactions';
+import { getEnvVars } from '../utils/getEnvVars';
 import { addSigToAllCreds } from './utils/addSignatureToAllCred';
 
 /**
@@ -24,7 +24,7 @@ const createChainTxExample = async () => {
   const vmId = 'rWhpuQPF1kb72esV2momhMuTYGkEb1oL29pt2EBXWmSy4kxnT'; // platform vmId
   const subnetId = ''; // subnetId from createSubnetTx
 
-  const tx = pvm.e.newCreateChainTx(
+  const tx = pvm.newCreateChainTx(
     {
       feeState,
       fromAddressesBytes: [testPAddr],

examples/p-chain/etna/createSubnet.ts → examples/p-chain/createSubnet.ts

@@ -1,5 +1,5 @@
-import { addTxSignatures, pvm, utils } from '../../../src';
-import { getEnvVars } from '../../utils/getEnvVars';
+import { addTxSignatures, pvm, utils } from '../../src';
+import { getEnvVars } from '../utils/getEnvVars';
 import { setupEtnaExample } from './utils/etna-helper';
 
 const createSubnetTxExample = async () => {
@@ -11,7 +11,7 @@ const createSubnetTxExample = async () => {
 
   const testPAddr = utils.bech32ToBytes(P_CHAIN_ADDRESS);
 
-  const tx = pvm.e.newCreateSubnetTx(
+  const tx = pvm.newCreateSubnetTx(
     {
       feeState,
       fromAddressesBytes: [testPAddr],

examples/p-chain/delegate.ts

@@ -1,42 +1,49 @@
-import { PrimaryNetworkID } from '../../src/constants/networkIDs';
-import { addTxSignatures } from '../../src/signer';
-import { bech32ToBytes, hexToBuffer } from '../../src/utils';
-import { getContextFromURI } from '../../src/vms/context';
-import { PVMApi, newAddPermissionlessDelegatorTx } from '../../src/vms/pvm';
-import { pvmapi } from '../chain_apis';
+import { addTxSignatures, networkIDs, pvm, utils } from '../../src';
 import { getEnvVars } from '../utils/getEnvVars';
+import { setupEtnaExample } from './utils/etna-helper';
+
+const AMOUNT_TO_DELEGATE_AVAX: number = 1;
+const DAYS_TO_DELEGATE: number = 14;
 
 const main = async () => {
   const { AVAX_PUBLIC_URL, P_CHAIN_ADDRESS, PRIVATE_KEY } = getEnvVars();
 
-  const { utxos } = await pvmapi.getUTXOs({ addresses: [P_CHAIN_ADDRESS] });
-  const context = await getContextFromURI(AVAX_PUBLIC_URL);
-  const startTime = await new PVMApi().getTimestamp();
+  const { context, feeState, pvmApi } = await setupEtnaExample(AVAX_PUBLIC_URL);
+
+  const { utxos } = await pvmApi.getUTXOs({ addresses: [P_CHAIN_ADDRESS] });
+
+  const startTime = await pvmApi.getTimestamp();
   const startDate = new Date(startTime.timestamp);
-  const start = BigInt(startDate.getTime() / 1000);
+  const start: bigint = BigInt(startDate.getTime() / 1_000);
+
   const endTime = new Date(startTime.timestamp);
-  endTime.setDate(endTime.getDate() + 21);
-  const end = BigInt(endTime.getTime() / 1000);
-  const nodeID = 'NodeID-HKLp5269LH8DcrLvHPc2PHjGczBQD3td4';
+  endTime.setDate(endTime.getDate() + DAYS_TO_DELEGATE);
+  const end: bigint = BigInt(endTime.getTime() / 1_000);
+
+  // TODO: Get this from an argument.
+  const nodeId = 'NodeID-MqgFXT8JhorbEW2LpTDGePBBhv55SSp3M';
 
-  const tx = newAddPermissionlessDelegatorTx(
+  const tx = pvm.newAddPermissionlessDelegatorTx(
+    {
+      end,
+      feeState,
+      fromAddressesBytes: [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
+      nodeId,
+      rewardAddresses: [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
+      start,
+      subnetId: networkIDs.PrimaryNetworkID.toString(),
+      utxos,
+      weight: BigInt(AMOUNT_TO_DELEGATE_AVAX * 1e9),
+    },
     context,
-    utxos,
-    [bech32ToBytes(P_CHAIN_ADDRESS)],
-    nodeID,
-    PrimaryNetworkID.toString(),
-    start,
-    end,
-    BigInt(1e9),
-    [bech32ToBytes(P_CHAIN_ADDRESS)],
   );
 
   await addTxSignatures({
     unsignedTx: tx,
-    privateKeys: [hexToBuffer(PRIVATE_KEY)],
+    privateKeys: [utils.hexToBuffer(PRIVATE_KEY)],
   });
 
-  return pvmapi.issueSignedTx(tx.getSignedTx());
+  return pvmApi.issueSignedTx(tx.getSignedTx());
 };
 
 main().then(console.log);