ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 08:46:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ximinez/acquireAsyncDispatch

Browse Source
This commit is contained in:
Ed Hennis
2026-05-12 19:19:01 -04:00
committed by GitHub
parent b21b3596f8 170eb5e588
commit 4dae405762
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/reusable-build-test-config.yml vendored
View File

@@ -181,7 +181,7 @@ jobs:
- name: Build the binary
working-directory: ${{ env.BUILD_DIR }}
env:
BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
BUILD_NPROC: ${{ runner.os == 'Linux' && '16' || steps.nproc.outputs.nproc }}
BUILD_TYPE: ${{ inputs.build_type }}
CMAKE_TARGET: ${{ inputs.cmake_target }}
run: |

2
src/libxrpl/protocol/Issue.cpp
View File

@@ -128,7 +128,7 @@ issueFromJson(json::Value const& v)
}
auto const issuer = parseBase58<AccountID>(issStr.asString());
if (!issuer)
if (!issuer || *issuer == noAccount() || *issuer == xrpAccount())
{
Throw<json::Error>("issueFromJson issuer must be a valid account");
}

7
src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
View File

@@ -110,12 +110,13 @@ PermissionedDomainSet::doApply()
if (balance < reserve)
return tecINSUFFICIENT_RESERVE;
Keylet const pdKeylet =
keylet::permissionedDomain(account_, ctx_.tx.getFieldU32(sfSequence));
bool const fix313 = view().rules().enabled(fixSecurity3_1_3);
auto const seq = fix313 ? ctx_.tx.getSeqValue() : ctx_.tx.getFieldU32(sfSequence);
Keylet const pdKeylet = keylet::permissionedDomain(account_, seq);
auto slePd = std::make_shared<SLE>(pdKeylet);
slePd->setAccountID(sfOwner, account_);
slePd->setFieldU32(sfSequence, ctx_.tx.getFieldU32(sfSequence));
slePd->setFieldU32(sfSequence, seq);
slePd->peekFieldArray(sfAcceptedCredentials) = std::move(sortedLE);
auto const page =
view().dirInsert(keylet::ownerDir(account_), pdKeylet, describeOwnerDir(account_));