Skip to content

[SDK] Improve contract-roles methods #1798

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

Merged
merged 4 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/clever-buttons-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@thirdweb-dev/sdk": patch
---

Improve performance for contract-roles methods
57 changes: 31 additions & 26 deletions packages/sdk/src/evm/core/classes/contract-roles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ export class ContractRoles<TContract extends IPermissions, TRole extends Role>
public async getAll(): Promise<Record<TRole, string[]>> {
invariant(this.roles.length, "this contract has no support for roles");
const roles = {} as Record<TRole, string[]>;
for (const role of this.roles) {
roles[role] = await this.get(role);
}
const entries = Object.entries(this.roles);
(await Promise.all(entries.map(([, role]) => this.get(role)))).forEach(
(item, index) => (roles[entries[index][1]] = item),
);
return roles;
}

Expand Down Expand Up @@ -151,17 +152,18 @@ export class ContractRoles<TContract extends IPermissions, TRole extends Role>
const sortedRoles = roles.sort((role) => (role === "admin" ? 1 : -1));
for (let i = 0; i < sortedRoles.length; i++) {
const role = sortedRoles[i];
const addresses: Address[] = await Promise.all(
rolesWithAddresses[role]?.map(
async (addressOrEns) => await resolveAddress(addressOrEns),
) || [],
);
const currentAddresses: Address[] = await Promise.all(
currentRoles[role]?.map(
async (addressOrEns) =>
await resolveAddress(addressOrEns as AddressOrEns),
) || [],
);
const [addresses, currentAddresses] = await Promise.all([
Promise.all(
rolesWithAddresses[role]?.map((addressOrEns) =>
resolveAddress(addressOrEns),
) || [],
),
Promise.all(
currentRoles[role]?.map((addressOrEns) =>
resolveAddress(addressOrEns as AddressOrEns),
) || [],
),
]);
const toAdd = addresses.filter(
(address) => !currentAddresses.includes(address),
);
Expand All @@ -176,18 +178,17 @@ export class ContractRoles<TContract extends IPermissions, TRole extends Role>
});
}
if (toRemove.length) {
for (let j = 0; j < toRemove.length; j++) {
const address = toRemove[j];
const revokeFunctionName = (await this.getRevokeRoleFunctionName(
address,
)) as any;
const revokeFunctionNames = await Promise.all(
toRemove.map((address) => this.getRevokeRoleFunctionName(address)),
);
revokeFunctionNames.forEach((revokeFunctionName, index) =>
encoded.push(
contractEncoder.encode(revokeFunctionName, [
getRoleHash(role),
address,
toRemove[index],
]),
);
}
),
);
}
}

Expand All @@ -211,8 +212,10 @@ export class ContractRoles<TContract extends IPermissions, TRole extends Role>
public async verify(roles: TRole[], address: AddressOrEns): Promise<void> {
await Promise.all(
roles.map(async (role) => {
const members = await this.get(role);
const resolvedAddress: Address = await resolveAddress(address);
const [members, resolvedAddress] = await Promise.all([
this.get(role),
resolveAddress(address),
]);
if (
!members
.map((a) => a.toLowerCase())
Expand Down Expand Up @@ -310,8 +313,10 @@ export class ContractRoles<TContract extends IPermissions, TRole extends Role>
****************************/

private async getRevokeRoleFunctionName(address: AddressOrEns) {
const resolvedAddress = await resolveAddress(address);
const signerAddress = await this.contractWrapper.getSignerAddress();
const [resolvedAddress, signerAddress] = await Promise.all([
resolveAddress(address),
this.contractWrapper.getSignerAddress(),
]);
if (signerAddress.toLowerCase() === resolvedAddress.toLowerCase()) {
return "renounceRole";
}
Expand Down