Skip to content

Commit

Permalink
Merge pull request #264 from multiversx/main-into-12
Browse files Browse the repository at this point in the history
Merge main into feat/v12
  • Loading branch information
bogdan-rosianu authored Feb 22, 2023
2 parents 2cb3cd0 + 21b6a55 commit e9ca52b
Show file tree
Hide file tree
Showing 31 changed files with 1,906 additions and 318 deletions.
169 changes: 2 additions & 167 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-core",
"version": "12.0.1-alpha.1",
"version": "12.0.1-beta.0",
"description": "MultiversX SDK for JavaScript and TypeScript",
"main": "out/index.js",
"types": "out/index.d.js",
Expand Down Expand Up @@ -50,7 +50,6 @@
"mocha": "9.2.2",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typedoc": "0.22.13",
"typescript": "4.1.2"
}
}
18 changes: 0 additions & 18 deletions src/_docs/basic.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/_docs/codec.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/_docs/errors.ts

This file was deleted.

20 changes: 0 additions & 20 deletions src/_docs/smartcontracts.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/_docs/typesystem.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const ESDT_TRANSFER_FUNCTION_NAME = "ESDTTransfer";
export const ESDTNFT_TRANSFER_FUNCTION_NAME = "ESDTNFTTransfer";
export const MULTI_ESDTNFT_TRANSFER_FUNCTION_NAME = "MultiESDTNFTTransfer";
export const ESDT_TRANSFER_VALUE = "0";
export const ARGUMENTS_SEPARATOR = "@";

// Masks needed for checking specific options when Transaction version is not default (1)
// 0b0001 - TRANSACTION_OPTIONS_TX_HASH_SIGN (only)
Expand Down
9 changes: 9 additions & 0 deletions src/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,15 @@ export class ErrCannotParseContractResults extends Err {
}
}

/**
* Signals an error when parsing the outcome of a transaction (results and logs).
*/
export class ErrCannotParseTransactionOutcome extends Err {
public constructor(transactionHash: string, message: string) {
super(`cannot parse outcome of transaction ${transactionHash}: ${message}`);
}
}

/**
* Signals a generic codec (encode / decode) error.
*/
Expand Down
Loading

0 comments on commit e9ca52b

Please sign in to comment.