Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replace rjson with serde_json #677

Merged
merged 3 commits into from
Feb 6, 2023
Merged

Conversation

aleksuss
Copy link
Member

@aleksuss aleksuss commented Feb 2, 2023

Description

The PR replaces rjson crate with serde_json.

Performance / NEAR gas cost considerations

There are no changes related to gas costs.

How should this be reviewed

Pay attention to JSON API.

Additional information

Question about Yocto struct. Should it have a custom de/serialisation like Balance and NEP141Wei?

Copy link
Contributor

@joshuajbouw joshuajbouw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to remove the engine/src/json.rs file too, that was added specifically to help make rjson json compliant.

@aleksuss
Copy link
Member Author

aleksuss commented Feb 3, 2023

We need to remove the engine/src/json.rs file too, that was added specifically to help make rjson json compliant.

Yes. Good catch. My fault.

@joshuajbouw
Copy link
Contributor

Needs to be explored we are unblocked on not being on Nightly anymore finally.

@aleksuss
Copy link
Member Author

aleksuss commented Feb 6, 2023

Yes. But I preferred to do that in another PR.

engine/src/lib.rs Show resolved Hide resolved
Copy link
Member

@mrLSD mrLSD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@aleksuss aleksuss merged commit f6747cb into develop Feb 6, 2023
@aleksuss aleksuss deleted the feat/aleksuss/serde_json branch February 6, 2023 16:28
@joshuajbouw joshuajbouw mentioned this pull request Apr 5, 2023
birchmd pushed a commit that referenced this pull request Apr 5, 2023
joshuajbouw added a commit that referenced this pull request Apr 5, 2023
## [2.9.0] 2023-04-05

### Added

- Enabled XCC for mainnet release by [@birchmd]. ([#694])
- Added `set_owner` contract method which sets the owner of the contract
by [@hskang9]. ([#690])
- New variant of submit function `submit_with_args` which accepts
additional arguments along with the transaction such as the max gas
price a user is ready to pay by [@aleksuss]. ([#696])
- Added the ability to create and fund XCC sub-accounts from external
NEAR accounts by [@birchmd]. ([#735])

### Changes

- Replaced `rjson` with `serde_json` by [@aleksuss]. ([#677])
- Changed owner intended contract methods to now require owner or the
contract itself by [@hskang9]. ([#676])

### Fixes

- Fixed nonce incorrectly being incremented on an out of fund failure by
[@joshuajbouw]. ([#671])
- Fixed a check in promise results before executing cross contract calls
(XCC) callbacks by [@birchmd]. ([#693])
- Fixed a reachable panic in `receive_erc20_tokens` by [@0x3bfc].
([#709])
- Fixed a lack of minimum size checks when instantiating a new `EthGas`
object by [@lempire123]. ([#722])
- Fixed a lack of division by 0 checks in `EthGas::Div()` by
[@lempire123]. ([#718])
- Fixed the validation of the return of `exports:storage_remove` by
[@0x3bfc]. ([#712])
- Fixed missing account validations of NEAR account IDs by [@0x3bfc].
([#703])
- Fixed a reachable panic in the `exitToNear` and `exitToEthereum`
precompiles if the input amount is greater than 1^128 when cast from a
`U256` to `u128` by [@0x3bfc]. ([#681])
- Fixed a reachable panic in `modExp` due to arithmetic overflow by
[@0x3bfc]. ([#688])
- Fixed the ability attaching values to Aurora specific precompiles,
this no longer is possible, by [@0x3bfc]. ([#714])
- Fixed a return error if an ecrecover signature length is not exactly
65 by [@0x3bfc]. ([#717])
- Fixed size checks on input array passed to `exitToNear` and
`exitToEthereum` precompiles by [@0x3bfc]. ([#684])
- Fixed missing gas costs in `exitToNear` and `exitToEthereum`
precompiles by [@lempire123]. ([#687])
- Fixed a reachable panic due to out of memory in the `modExp`
precompile by [@0x3bfc]. ([#689])
- Fixed an assurance that the `sender_id` has a balance greater than the
amount in `ft_transfer_call` by [@0x3bfc]. ([#708])
- Fixed returning `0x` when a length cannot be cast as `usize` instead
of returning an error in the `modExp` precompile by [@birchmd]. ([#737])
- Miscellaneous minor fixes by [@0x3bfc]. ([#738])

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Leandro Casuso Montero <[email protected]>
Co-authored-by: Michael Birch <[email protected]>
Co-authored-by: Alexey Lapitsky <[email protected]>
Co-authored-by: Oleksandr Anyshchenko <[email protected]>
Co-authored-by: Alexey Lapitsky <[email protected]>
Co-authored-by: Hyungsuk Kang <[email protected]>
Co-authored-by: Ahmed Ali <[email protected]>
Co-authored-by: lempire123 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants