a few fixes

Author: timotejvesel

test-scripts/README.md

@@ -3,24 +3,24 @@
 Tests are performed on **localflare** network and include:
 - C-chain to P-chain transfer (100 FLR)
 - P-chain to C-chain transfer (100 FLR)
-- Add validator (`NodeID-MFrZFVCXPv5iCn6M9K6XduxGTYp891xXZ` with weight 10.000 FLR and duration of 14 days)
-- Add delegator (To node `NodeID-7Xhw2mDxuDS44j42TCB6U5579esbSt3Lg` with weight 10.000 FLR and duration of 1 hour)
+- Add validator (`NodeID-MFrZFVCXPv5iCn6M9K6XduxGTYp891xXZ` with weight 10,000 FLR and duration of 14 days)
+- Add delegator (To node `NodeID-7Xhw2mDxuDS44j42TCB6U5579esbSt3Lg` with weight 10,000 FLR and duration of 1 hour)
 
-Run localflare with in `avalanchego` directory:
+Run localflare in `avalanchego` directory:
 ```bash
 ./scripts/build.sh. # Build avalanchego
 ./scripts/localflare.sh. # Run 5 localflare nodes
 ```
 Check that the nodes are running by visiting `http://localhost:9650/ext/health` in your browser.
 
-Then, in a separate terminal, run the test scripts in this directory:
+Then, in a separate terminal, run the test scripts in this (`test-scripts`) directory:
 ```bash
-yarn 
+yarn
 yarn run p-chain-import
 yarn run p-chain-export
 yarn run add-validator
 yarn run add-delegator
 ```
 Note:
-- Nodejs version 20 in requred to run the scripts, also make sure you have the `yarn` package manager installed.
+- Nodejs version 20 is required to run the scripts, also make sure you have the `yarn` package manager installed.
 - The scripts assume that the localflare network is running and accessible at the default ports.

test-scripts/src/runner.ts

@@ -1,6 +1,6 @@
 import { CChainBalance, formatDecimal, PChainBalance } from "./utils";
 
-async function runWithBalanches(func: () => Promise<void>) {
+async function runWithBalances(func: () => Promise<void>) {
     // Log the current balances before calling the function
     let cBalanceFLR = await CChainBalance();
     let pBalanceFLR = await PChainBalance();
@@ -20,7 +20,7 @@ async function runWithBalanches(func: () => Promise<void>) {
 
 export async function runTest(func: () => Promise<void>) {
     try {
-        await runWithBalanches(func);
+        await runWithBalances(func);
         console.log('Script completed successfully');
     } catch (error) {
         console.error('Script failed:', error);

test-scripts/src/test-add-delegator.ts

@@ -5,7 +5,7 @@ import { runTest } from "./runner";
 async function addDelegator(nodeID: string, endTime: number, weight: number) {
     const ctx = await localFlareContext();
 
-    // Create the transaction to add a delegator    
+    // Create the transaction to add a delegator
     console.log(`Creating add delegator transaction for node ${nodeID} with weight ${weight}...`);
 
     const { utxos } = await ctx.pvmapi.getUTXOs({
@@ -19,7 +19,7 @@ async function addDelegator(nodeID: string, endTime: number, weight: number) {
         networkIDs.PrimaryNetworkID.toString(),
         BigInt(Date.now()) / 1000n,
         BigInt(endTime),
-        BigInt(weight * 1e9), 
+        BigInt(weight * 1e9),
         [utils.bech32ToBytes(ctx.addressP)],
     );
 
@@ -28,6 +28,6 @@ async function addDelegator(nodeID: string, endTime: number, weight: number) {
 
 runTest(() => addDelegator(
     'NodeID-7Xhw2mDxuDS44j42TCB6U5579esbSt3Lg',
-    Math.ceil(Date.now() / 1000) + 60 * 60 + 5, // 1 hour (+ 5 seconds) from now 
+    Math.ceil(Date.now() / 1000) + 60 * 60 + 5, // 1 hour (+ 5 seconds) from now
     10_000
 ))

test-scripts/src/test-add-validator.ts

@@ -2,7 +2,7 @@ import { networkIDs, pvm, utils } from "@flarenetwork/flarejs";
 import { issuePChainTx, localFlareContext } from "./utils";
 import { runTest } from "./runner";
 
-const blsPublicKey = '0x917386c374aab0ea3d2bda96768f2be1f0b11483cd5c41bd9cddd3892b693ab84efecc6cf70300d614dcdc6d298ab659'; 
+const blsPublicKey = '0x917386c374aab0ea3d2bda96768f2be1f0b11483cd5c41bd9cddd3892b693ab84efecc6cf70300d614dcdc6d298ab659';
 const blsSignature = '0x81c7174fc3bc9bbf00a1e26cc7b177d92589b517df5c46844498c14ede655bfedb89929e3d2974210983a1ff06a2a39b05208974a2d3dddac4948bcc81f367717d960be9704b775f21022d639b439135d34b7fb1f2bacbb5ffab3ddafc86220f'
 
 async function addValidator(nodeID: string, endTime: number, weight: number) {
@@ -22,7 +22,7 @@ async function addValidator(nodeID: string, endTime: number, weight: number) {
         networkIDs.PrimaryNetworkID.toString(),
         BigInt(Date.now()) / 1000n,
         BigInt(endTime),
-        BigInt(weight * 1e9), 
+        BigInt(weight * 1e9),
         [utils.bech32ToBytes(ctx.addressP)],
         [utils.bech32ToBytes(ctx.addressP)],
         10_0000,
@@ -38,6 +38,6 @@ async function addValidator(nodeID: string, endTime: number, weight: number) {
 
 runTest(() => addValidator(
     'NodeID-MFrZFVCXPv5iCn6M9K6XduxGTYp891xXZ',
-    Math.ceil(Date.now() / 1000) + 14 * 24 * 60 * 60 + 5, // 14 days (+ 5 seconds) from now 
+    Math.ceil(Date.now() / 1000) + 14 * 24 * 60 * 60 + 5, // 14 days (+ 5 seconds) from now
     10_000
 ))

test-scripts/src/test-p-chain-export.ts

@@ -4,7 +4,7 @@ import { runTest } from './runner';
 
 async function PtoCExport(amountFLR: number) {
     const ctx = await localFlareContext();
-    const baseFee = await ctx.evmapi.getBaseFee();
+    const fee = 1; // in FLR
 
     // Create and issue a P to C export transaction
     console.log(`Creating P to C export transaction for ${amountFLR} FLR...`);
@@ -33,13 +33,13 @@ async function PtoCExport(amountFLR: number) {
         addresses: ['C-' + ctx.addressP.slice(2)],
     });
 
-    const importTx = evm.newImportTxFromBaseFee(
+    const importTx = evm.newImportTx(
         ctx.context,
         utils.hexToBuffer(ctx.addressC),
         [utils.bech32ToBytes(ctx.addressP)],
         utxosc,
         ctx.context.pBlockchainID,
-        baseFee / BigInt(1e9),
+        BigInt(fee * 1e9),
     );
 
     await issueCChainTx(ctx.evmapi, importTx, ctx.privateKey);

test-scripts/src/test-p-chain-import.ts

@@ -4,21 +4,21 @@ import { runTest } from './runner';
 
 async function CtoPExport(amountFLR: number) {
     const ctx = await localFlareContext();
-    const baseFee = await ctx.evmapi.getBaseFee();
+    const fee = 1; // in FLR
     const txCount = await ctx.provider.getTransactionCount(ctx.addressC);
 
     // Create and issue a C to P export transaction
     console.log(`Creating C to P export transaction for ${amountFLR} FLR...`);
 
-    const exportTx = evm.newExportTxFromBaseFee(
+    const exportTx = evm.newExportTx(
         ctx.context,
-        baseFee / BigInt(1e9),
         BigInt(amountFLR * 1e9),
         ctx.context.pBlockchainID,
         utils.hexToBuffer(ctx.addressC),
         [utils.bech32ToBytes(ctx.addressP)],
+        BigInt(fee * 1e9),
         BigInt(txCount),
-    );
+    )
 
     await issueCChainTx(ctx.evmapi, exportTx, ctx.privateKey);
 

test-scripts/src/utils.ts

@@ -1,4 +1,4 @@
-import { evm, pvm, Context, addTxSignatures, UnsignedTx, utils} from '@flarenetwork/flarejs';
+import { evm, pvm, Context, addTxSignatures, UnsignedTx, utils } from '@flarenetwork/flarejs';
 import { JsonRpcProvider } from 'ethers'
 
 export const LocalURL = 'http://localhost:9650';
@@ -68,7 +68,7 @@ export async function issuePChainTx(pvmapi: pvm.PVMApi, tx: UnsignedTx, privateK
 
     const exportResponse = await pvmapi.issueSignedTx(tx.getSignedTx());
     const txID = exportResponse.txID;
-    console.log(`Issued transaction with ID: ${txID}`);    
+    console.log(`Issued transaction with ID: ${txID}`);
 
     console.log(`Waiting for transaction ${txID} to be processed...`);
     let txStatus;
@@ -88,11 +88,11 @@ export async function issueCChainTx(evmapi: evm.EVMApi, tx: UnsignedTx, privateK
     await addTxSignatures({
         unsignedTx: tx,
         privateKeys: [utils.hexToBuffer(privateKey)],
-    });    
+    });
 
     const exportResponse = await evmapi.issueSignedTx(tx.getSignedTx());
     const txID = exportResponse.txID;
-    console.log(`Issued transaction with ID: ${txID}`);    
+    console.log(`Issued transaction with ID: ${txID}`);
 
     console.log(`Waiting for transaction ${txID} to be processed...`);
     let txStatus;