From c26c8b80217993e58afb04fc74e8b6cdea33479b Mon Sep 17 00:00:00 2001
From: Teddy Ding <teddy@dydx.exchange>
Date: Fri, 15 Nov 2024 10:27:42 -0500
Subject: [PATCH] fix(affiliates): Generate username with address, not
subaccount id (#2575)
---
.../roundtable/__tests__/helpers/usernames-helper.test.ts | 8 ++++++++
.../__tests__/tasks/subaccount-username-generator.test.ts | 8 ++++++++
.../services/roundtable/src/helpers/usernames-helper.ts | 4 ++--
.../roundtable/src/tasks/subaccount-username-generator.ts | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/indexer/services/roundtable/__tests__/helpers/usernames-helper.test.ts b/indexer/services/roundtable/__tests__/helpers/usernames-helper.test.ts
index 5ba926245a..d5392c2771 100644
--- a/indexer/services/roundtable/__tests__/helpers/usernames-helper.test.ts
+++ b/indexer/services/roundtable/__tests__/helpers/usernames-helper.test.ts
@@ -13,6 +13,10 @@ describe('usernames-helper', () => {
'dydx1df84hz7y0dd3mrqcv3vrhw9wdttelul8edqmvp',
'dydx16h7p7f4dysrgtzptxx2gtpt5d8t834g9dj830z',
'dydx15u9tppy5e2pdndvlrvafxqhuurj9mnpdstzj6z',
+ 'dydx1q54yvrslnu0xp4drpde6f4e0k2ap9efss5hpsd',
+ 'dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju4',
+ 'dydx1n88uc38xhjgxzw9nwre4ep2c8ga4fjxc565lnf',
+ 'dydx1n88uc38xhjgxzw9nwre4ep2c8ga4fjxc575lnf',
];
const expectedUsernames = [
@@ -24,6 +28,10 @@ describe('usernames-helper', () => {
'BoldGapOGY',
'ZoomEraQE0',
'WiryFernLEC',
+ 'RudeFuel59E',
+ 'MacroMealFK5',
+ 'HappySnapWTT',
+ 'BumpyEdgeH5Y',
];
for (let i = 0; i < addresses.length; i++) {
diff --git a/indexer/services/roundtable/__tests__/tasks/subaccount-username-generator.test.ts b/indexer/services/roundtable/__tests__/tasks/subaccount-username-generator.test.ts
index 1a7ce0dfa1..cceb9fe631 100644
--- a/indexer/services/roundtable/__tests__/tasks/subaccount-username-generator.test.ts
+++ b/indexer/services/roundtable/__tests__/tasks/subaccount-username-generator.test.ts
@@ -48,6 +48,14 @@ describe('subaccount-username-generator', () => {
SubaccountUsernamesTable.findAll(
{}, [], {});
+ const expectedUsernames = [
+ 'BumpyEdgeH5Y', // dydx1n88uc38xhjgxzw9nwre4ep2c8ga4fjxc575lnf
+ 'HappySnapWTT', // dydx1n88uc38xhjgxzw9nwre4ep2c8ga4fjxc565lnf
+ 'MacroMealFK5', // dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju4
+ ];
expect(subaccountsWithUsernamesAfter.length).toEqual(subaccountsLength);
+ for (let i = 0; i < expectedUsernames.length; i++) {
+ expect(subaccountsWithUsernamesAfter[i].username).toEqual(expectedUsernames[i]);
+ }
});
});
diff --git a/indexer/services/roundtable/src/helpers/usernames-helper.ts b/indexer/services/roundtable/src/helpers/usernames-helper.ts
index 1c30e076b6..2c082fa4a2 100644
--- a/indexer/services/roundtable/src/helpers/usernames-helper.ts
+++ b/indexer/services/roundtable/src/helpers/usernames-helper.ts
@@ -7,11 +7,11 @@ import nouns from './nouns.json';
const suffixCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
export function generateUsernameForSubaccount(
- subaccountId: string,
+ address: string,
subaccountNum: number,
nounce: number = 0, // incremented in case of collision
): string {
- const rng = seedrandom(`${subaccountId}/${subaccountNum}/${nounce}`);
+ const rng = seedrandom(`${address}/${subaccountNum}/${nounce}`);
const randomAdjective: string = adjectives[Math.floor(rng() * adjectives.length)];
const randomNoun: string = nouns[Math.floor(rng() * nouns.length)];
const randomSuffix: string = Array.from(
diff --git a/indexer/services/roundtable/src/tasks/subaccount-username-generator.ts b/indexer/services/roundtable/src/tasks/subaccount-username-generator.ts
index d1a435cb64..03fd93f522 100644
--- a/indexer/services/roundtable/src/tasks/subaccount-username-generator.ts
+++ b/indexer/services/roundtable/src/tasks/subaccount-username-generator.ts
@@ -20,7 +20,7 @@ export default async function runTask(): Promise<void> {
for (const subaccount of subaccountZerosWithoutUsername) {
for (let i = 0; i < config.ATTEMPT_PER_SUBACCOUNT; i++) {
const username: string = generateUsernameForSubaccount(
- subaccount.subaccountId,
+ subaccount.address,
// Always use subaccountNum 0 for generation. Effectively we are
// generating one username per address. The fact that we are storing
// in the `subaccount_usernames` table is a tech debt.