@waves/ts-types - npm Package Compare versions

Comparing version 1.0.6-beta.4 to 1.0.6-beta.5

dist/src/index.d.ts

@@ -20,3 +20,3 @@ export * from '../transactions';
 export declare const UPDATE_ASSET_INFO_TYPE: 17;
-export declare const INVOKE_EXPRESSION_TYPE: 18;
+export declare const ETHEREUM: 19;
 export declare const INTEGER_DATA_TYPE: "integer";
@@ -44,3 +44,3 @@ export declare const BOOLEAN_DATA_TYPE: "boolean";
     UPDATE_ASSET_INFO: 17;
-    INVOKE_EXPRESSION: 18;
+    ETHEREUM: 19;
 };
@@ -47,0 +47,0 @@ export declare const DATA_FIELD_TYPE: {

dist/src/index.js

@@ -20,3 +20,3 @@ "use strict";
 exports.UPDATE_ASSET_INFO_TYPE = 17;
-exports.INVOKE_EXPRESSION_TYPE = 18;
+exports.ETHEREUM = 19;
 exports.INTEGER_DATA_TYPE = 'integer';
@@ -44,3 +44,3 @@ exports.BOOLEAN_DATA_TYPE = 'boolean';
     UPDATE_ASSET_INFO: exports.UPDATE_ASSET_INFO_TYPE,
-    INVOKE_EXPRESSION: exports.INVOKE_EXPRESSION_TYPE,
+    ETHEREUM: exports.ETHEREUM,
 };
@@ -47,0 +47,0 @@ exports.DATA_FIELD_TYPE = {

dist/transactions/index.d.ts

@@ -1,2 +0,2 @@
-import { InvokeScriptCall, InvokeScriptPayment, MassTransferItem, DataTransactionEntry, ExchangeTransactionOrder, TRANSACTION_TYPE, TransactionType, Long, AssetDecimals, Base64Script, Base58Bytes, WithVersion, SignedIExchangeTransactionOrder } from '../src';
+import { AssetDecimals, Base58Bytes, Base64Script, DataTransactionEntry, ExchangeTransactionOrder, InvokeScriptCall, InvokeScriptPayment, Long, MassTransferItem, SignedIExchangeTransactionOrder, TRANSACTION_TYPE, TransactionType, WithVersion } from '../src';
 export declare type BaseTransaction<LONG = Long, TYPE extends TransactionType = TransactionType> = {
@@ -9,3 +9,3 @@ type: TYPE;
 };
-export declare type Transaction<LONG = Long> = GenesisTransaction<LONG> | PaymentTransaction<LONG> | IssueTransaction<LONG> | TransferTransaction<LONG> | ReissueTransaction<LONG> | BurnTransaction<LONG> | LeaseTransaction<LONG> | CancelLeaseTransaction<LONG> | AliasTransaction<LONG> | MassTransferTransaction<LONG> | DataTransaction<LONG> | SetScriptTransaction<LONG> | SponsorshipTransaction<LONG> | ExchangeTransaction<LONG> | SetAssetScriptTransaction<LONG> | InvokeScriptTransaction<LONG> | UpdateAssetInfoTransaction<LONG> | InvokeExpressionTransaction<LONG>;
+export declare type Transaction<LONG = Long> = GenesisTransaction<LONG> | PaymentTransaction<LONG> | IssueTransaction<LONG> | TransferTransaction<LONG> | ReissueTransaction<LONG> | BurnTransaction<LONG> | LeaseTransaction<LONG> | CancelLeaseTransaction<LONG> | AliasTransaction<LONG> | MassTransferTransaction<LONG> | DataTransaction<LONG> | SetScriptTransaction<LONG> | SponsorshipTransaction<LONG> | ExchangeTransaction<LONG> | SetAssetScriptTransaction<LONG> | InvokeScriptTransaction<LONG> | UpdateAssetInfoTransaction<LONG> | EthereumTransaction<LONG>;
 export declare type TransactionMap<LONG = Long> = {
@@ -29,3 +29,3 @@ [TRANSACTION_TYPE.GENESIS]: GenesisTransaction<LONG>;
     [TRANSACTION_TYPE.UPDATE_ASSET_INFO]: UpdateAssetInfoTransaction<LONG>;
-    [TRANSACTION_TYPE.INVOKE_EXPRESSION]: InvokeExpressionTransaction<LONG>;
+    [TRANSACTION_TYPE.ETHEREUM]: EthereumTransaction<LONG>;
 };
@@ -50,3 +50,3 @@ export declare type TransactionVersionsMap<LONG = Long> = {
     [TRANSACTION_TYPE.UPDATE_ASSET_INFO]: UpdateAssetInfoTransactionMap<LONG>;
-    [TRANSACTION_TYPE.INVOKE_EXPRESSION]: InvokeExpressionTransaction<LONG>;
+    [TRANSACTION_TYPE.ETHEREUM]: EthereumTransactionMap<LONG>;
 };
@@ -138,8 +138,12 @@ declare type Omit<A extends Record<string, any>, B extends keyof A> = {
 };
-export declare type InvokeExpressionTransactionFields<LONG = Long> = {
-    expression: Base64Script | null;
-    feeAssetId: string | null;
-};
 export interface IUpdateAssetInfoTransaction<LONG = Long> extends BaseTransaction<LONG, typeof TRANSACTION_TYPE.UPDATE_ASSET_INFO>, UpdateAssetInfoTransactionFields<LONG> {
 }
+export declare type EthereumTransactionFields<LONG = Long> = {
+    payload: ({
+        type: 'invocation';
+    } & InvokeScriptTransactionFields) | ({
+        type: 'transfer';
+    } & Omit<TransferTransactionFields, 'attachment'>);
+    bytes: string;
+};
 export declare type GenesisTransactionV1<LONG> = WithVersion<GenesisTransactionFields<LONG> & Omit<BaseTransaction<LONG, 1>, 'senderPublicKey'>, 1>;
@@ -259,3 +263,6 @@ export declare type GenesisTransactionMap<LONG = Long> = {
 };
-export declare type InvokeExpressionTransactionV1<LONG> = WithVersion<InvokeExpressionTransactionFields<LONG> & BaseTransaction<LONG, 18>, 1>;
+export declare type EthereumTransactionV1<LONG> = WithVersion<EthereumTransactionFields<LONG> & BaseTransaction<LONG, 19>, 1>;
+export declare type EthereumTransactionMap<LONG = Long> = {
+    1: EthereumTransactionV1<LONG>;
+};
 export declare type GenesisTransaction<LONG = Long> = GenesisTransactionV1<LONG>;
@@ -278,3 +285,3 @@ export declare type PaymentTransaction<LONG = Long> = PaymentTransactionV1<LONG>;
 export declare type UpdateAssetInfoTransaction<LONG = Long> = UpdateAssetInfoTransactionV1<LONG>;
-export declare type InvokeExpressionTransaction<LONG = Long> = InvokeExpressionTransactionV1<LONG>;
+export declare type EthereumTransaction<LONG = Long> = EthereumTransactionV1<LONG>;
 declare type TWithSignatureMap = {
@@ -281,0 +288,0 @@ [TRANSACTION_TYPE.GENESIS]: 1;

package.json

 {
   "name": "@waves/ts-types",
-  "version": "1.0.6-beta.4",
+  "version": "1.0.6-beta.5",
   "main": "dist/src/index.js",
@@ -5,0 +5,0 @@ "types": "dist/src/index.d.ts",

src/index.ts

@@ -21,3 +21,3 @@ export * from '../transactions';
 export const UPDATE_ASSET_INFO_TYPE = 17 as 17;
-export const INVOKE_EXPRESSION_TYPE = 18 as 18;
+export const ETHEREUM = 19 as 19;
 
@@ -47,3 +47,3 @@ export const INTEGER_DATA_TYPE = 'integer' as 'integer';
     UPDATE_ASSET_INFO: UPDATE_ASSET_INFO_TYPE,
-    INVOKE_EXPRESSION: INVOKE_EXPRESSION_TYPE,
+    ETHEREUM: ETHEREUM,
 };
@@ -50,0 +50,0 @@

transactions/index.ts

 import {
+    AssetDecimals,
+    Base58Bytes,
+    Base64Script,
+    DataTransactionEntry,
+    ExchangeTransactionOrder,
     InvokeScriptCall,
     InvokeScriptPayment,
+    Long,
     MassTransferItem,
-    DataTransactionEntry,
-    ExchangeTransactionOrder,
+    SignedIExchangeTransactionOrder,
     TRANSACTION_TYPE,
     TransactionType,
-    Long,
-    AssetDecimals,
-    Base64Script,
-    Base58Bytes,
     WithVersion,
-    SignedIExchangeTransactionOrder,
 } from '../src';
@@ -46,3 +46,3 @@
     | UpdateAssetInfoTransaction<LONG>
-    | InvokeExpressionTransaction<LONG>;
+    | EthereumTransaction<LONG>;
 
@@ -67,3 +67,3 @@ export type TransactionMap<LONG = Long> = {
     [TRANSACTION_TYPE.UPDATE_ASSET_INFO]: UpdateAssetInfoTransaction<LONG>;
-    [TRANSACTION_TYPE.INVOKE_EXPRESSION]: InvokeExpressionTransaction<LONG>;
+    [TRANSACTION_TYPE.ETHEREUM]: EthereumTransaction<LONG>;
 };
@@ -89,3 +89,3 @@
     [TRANSACTION_TYPE.UPDATE_ASSET_INFO]: UpdateAssetInfoTransactionMap<LONG>;
-    [TRANSACTION_TYPE.INVOKE_EXPRESSION]: InvokeExpressionTransaction<LONG>;
+    [TRANSACTION_TYPE.ETHEREUM]: EthereumTransactionMap<LONG>;
 };
@@ -196,7 +196,2 @@
 
-export type InvokeExpressionTransactionFields<LONG = Long> = {
-    expression: Base64Script | null;
-    feeAssetId: string | null;
-};
-
 export interface IUpdateAssetInfoTransaction<LONG = Long>
@@ -206,2 +201,11 @@ extends BaseTransaction<LONG, typeof TRANSACTION_TYPE.UPDATE_ASSET_INFO>,
 
+export type EthereumTransactionFields<LONG = Long> = {
+    payload:
+        | ({ type: 'invocation' } & InvokeScriptTransactionFields)
+        | ({ type: 'transfer' } & Omit<
+              TransferTransactionFields,
+              'attachment'
+          >);
+    bytes: string;
+};
 //--------------------------------------------------------------------------------------------------------------------
@@ -492,8 +496,12 @@
 
-//InvokeExpressionTransaction
-export type InvokeExpressionTransactionV1<LONG> = WithVersion<
-    InvokeExpressionTransactionFields<LONG> & BaseTransaction<LONG, 18>,
+//EthereumTransaction
+export type EthereumTransactionV1<LONG> = WithVersion<
+    EthereumTransactionFields<LONG> & BaseTransaction<LONG, 19>,
     1
 >;
 
+export type EthereumTransactionMap<LONG = Long> = {
+    1: EthereumTransactionV1<LONG>;
+};
+
 //------------------------------------------------------------------------------------------
@@ -573,5 +581,3 @@ //Transaction types
 
-export type InvokeExpressionTransaction<
-    LONG = Long
-> = InvokeExpressionTransactionV1<LONG>;
+export type EthereumTransaction<LONG = Long> = EthereumTransactionV1<LONG>;
 
@@ -578,0 +584,0 @@ //

No alert changes

Improved metrics

Total package byte prevSize

60548

increased by0.29%

Lines of code

1560

increased by0.78%

Worsened metrics

Number of package files

16

decreased by-5.88%

No dependency changes