Skip to content

chore: merge master and resolve conflicts #2481

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.

Sign up for GitHub

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

Merged
shumkov merged 10 commits into from
Feb 27, 2025
Merged

chore: merge master and resolve conflicts #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1eae781
chore(platform): npm audit fix (#2463)
pshenmic Feb 14, 2025
0bd29a6
feat(dpp): extra methods for state transitions in wasm (#2462)
pshenmic Feb 14, 2025
196976c
fix(sdk)!: bigint for uint64 values (#2443)
pshenmic Feb 14, 2025
05d0085
Merge branch 'master' into v2.0-dev
shumkov Feb 26, 2025
f9eb069
Merge branch 'v2.0-dev' into chore/merge-master
pshenmic Feb 26, 2025
8160ccd
chore: remove duplicated commented code
shumkov Feb 27, 2025
045b6fa
chore(dpp): remove unnecessary type conversion
shumkov Feb 27, 2025
c57e8b2
test(dpp): fix assertion with the same value
shumkov Feb 27, 2025
c7e40cb
Merge remote-tracking branch 'origin/chore/merge-master' into chore/m…
shumkov Feb 27, 2025
da17fc5
feat(js-dash-sdk): fix tests after merge
pshenmic Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ npmAuditExcludePackages:
- abstract-leveldown # TODO: Update leveldb
- level-errors # TODO: Update leveldb
- level-concat-iterator # TODO: Update leveldb
- lodash.get # TODO: Deprecated. Replace to ?. operator.
- lodash.get # TODO: Deprecated. Replace to ?. operator. Update sinon

packageExtensions:
"@dashevo/protobufjs@*":
Expand Down
3 changes: 3 additions & 0 deletions packages/dapi-grpc/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "airbnb-base",
"env": {
"es2020": true
},
"rules": {
"import/no-extraneous-dependencies": ["error", { "packageDir": "." }],
"no-plusplus": 0,
Expand Down
512 changes: 256 additions & 256 deletions packages/dapi-grpc/clients/platform/v0/nodejs/platform_protoc.js
View file
Open in desktop

Large diffs are not rendered by default.

1,267 changes: 650 additions & 617 deletions packages/dapi-grpc/clients/platform/v0/python/platform_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

Loading