feat: adjust etna builder props (#882)

* feat: move memo and minIssuanceTime props on etna builder * feat: add changeAddressesBytes to etna builder * fix: optional signature and public key on NewAddPermissionlessValidatorTxProps * feat: consolidate spend change props
ava-labs · Oct 14, 2024 · ad65b27 · ad65b27
1 parent 24ceab1
commit ad65b27
Show file tree

Hide file tree

Showing 16 changed files with 317 additions and 307 deletions.
diff --git a/examples/p-chain/etna/import.ts b/examples/p-chain/etna/import.ts
@@ -18,7 +18,7 @@ const main = async () => {
       feeState,
       fromAddressesBytes: [utils.bech32ToBytes(X_CHAIN_ADDRESS)],
       sourceChainId: context.xBlockchainID,
-      toAddresses: [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
+      toAddressesBytes: [utils.bech32ToBytes(P_CHAIN_ADDRESS)],
       utxos,
     },
     context,

diff --git a/src/vms/avm/utxoCalculationFns/useAvmAndCorethUTXOs.ts b/src/vms/avm/utxoCalculationFns/useAvmAndCorethUTXOs.ts
@@ -35,7 +35,7 @@ export const useAvmAndCorethUTXOs = ({
       .filter((utxo) => !!isTransferOut(utxo.output as TransferOutput)),
     (utxo) => utxo.output as TransferOutput,
     fromAddresses,
-    options,
+    options.minIssuanceTime,
   ).forEach(({ sigData, data: utxo }) => {
     const utxoTransferout = utxo.output as TransferOutput;
 

diff --git a/src/vms/common/models.ts b/src/vms/common/models.ts
@@ -8,6 +8,6 @@ export type SpendOptions = {
 
 export type SpendOptionsRequired = Required<SpendOptions>;
 
-//the strign is address in hex
+//the string is address in hex
 export type SigMapping = Map<string, number>;
 export type SigMappings = SigMapping[];
diff --git a/src/vms/pvm/etna-builder/builder.test.ts b/src/vms/pvm/etna-builder/builder.test.ts
@@ -204,9 +204,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           fromAddressesBytes,
           feeState,
           outputs: [transferableOutput],
-          options: {
-            memo,
-          },
+          memo,
           utxos,
         },
         testContext,
@@ -244,11 +242,9 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
         {
           fromAddressesBytes,
           feeState,
-          options: {
-            memo,
-          },
+          memo,
           sourceChainId: testContext.cBlockchainID,
-          toAddresses: [testAddress1],
+          toAddressesBytes: [testAddress1],
           utxos,
         },
         testContext,
@@ -310,9 +306,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           destinationChainId: testContext.cBlockchainID,
           feeState,
           fromAddressesBytes,
-          options: {
-            memo,
-          },
+          memo,
           outputs: [tnsOut],
           utxos,
         },
@@ -363,9 +357,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
         {
           fromAddressesBytes,
           feeState,
-          options: {
-            memo,
-          },
+          memo,
           subnetOwners: [toAddress],
           utxos: [getValidUtxo(new BigIntPr(utxoInputAmt))],
         },
@@ -406,9 +398,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           fromAddressesBytes,
           fxIds: [],
           genesisData: testGenesisData,
-          options: {
-            memo,
-          },
+          memo,
           subnetAuth: [0],
           subnetId: Id.fromHex(testSubnetId).toString(),
           utxos: [getValidUtxo(new BigIntPr(utxoInputAmt))],
@@ -455,9 +445,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           subnetAuth: [0],
           subnetId: Id.fromHex(testSubnetId).toString(),
           start: 100n,
@@ -506,9 +494,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           fromAddressesBytes,
           feeState,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           subnetAuth: [0],
           subnetId: Id.fromHex(testSubnetId).toString(),
           utxos: [getValidUtxo(new BigIntPr(utxoInputAmt))],
@@ -553,9 +539,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           publicKey: blsPublicKeyBytes(),
           rewardAddresses: [],
           shares: 1,
@@ -621,9 +605,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           publicKey: blsPublicKeyBytes(),
           rewardAddresses: [],
           shares: 1,
@@ -690,9 +672,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           publicKey: blsPublicKeyBytes(),
           rewardAddresses: [],
           shares: 1,
@@ -750,9 +730,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           rewardAddresses: [],
           start: 0n,
           subnetId: PrimaryNetworkID.toString(),
@@ -811,9 +789,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           rewardAddresses: [],
           start: 0n,
           subnetId: Id.fromHex(testSubnetId).toString(),
@@ -873,9 +849,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           feeState,
           fromAddressesBytes,
           nodeId,
-          options: {
-            memo,
-          },
+          memo,
           rewardAddresses: [],
           stakingAssetId: stakingAssetId.toString(),
           start: 0n,
@@ -930,9 +904,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
         {
           fromAddressesBytes,
           feeState,
-          options: {
-            memo,
-          },
+          memo,
           subnetAuth,
           subnetId: Id.fromHex(testSubnetId).toString(),
           subnetOwners: [toAddress],
@@ -988,7 +960,7 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
           fromAddressesBytes,
           feeState,
           sourceChainId: testContext.cBlockchainID,
-          toAddresses: [testAddress1],
+          toAddressesBytes: [testAddress1],
           utxos,
         },
         testContext,