Generate a random Drip List ID when creating a new Drip List

src/lib/utils/__test__/calc-salt.unit.test.ts

@@ -0,0 +1,24 @@
+import calculateSaltFromAddress from '../calc-salt';
+
+describe('calculate salt', () => {
+  it('calculates a random salt', () => {
+    const SEED_CONSTANT = 'test';
+    const address = '0xe2E9b9B5d0757c26aB477A754788B19b60f2ed83';
+
+    const results = [
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+      calculateSaltFromAddress(SEED_CONSTANT, address),
+    ];
+
+    const set = new Set(results);
+    expect(set.size).toBe(results.length);
+  });
+});

src/lib/utils/calc-salt.ts

@@ -0,0 +1,13 @@
+import { ethers } from 'ethers';
+
+export default function calculateSaltFromAddress(seedConstant: string, address: string) {
+  const hash = ethers.keccak256(
+    ethers.AbiCoder.defaultAbiCoder().encode(['string'], [seedConstant + address]),
+  );
+  const addressBigInt = ethers.toBigInt('0x' + hash.slice(26));
+
+  const randomBytes = ethers.randomBytes(32);
+  const randomBigInt = BigInt(ethers.hexlify(randomBytes));
+
+  return addressBigInt & randomBigInt & BigInt('0xFFFFFFFFFFFFFFFF');
+}

src/lib/utils/driplist/DripListService.ts

@@ -1,6 +1,6 @@
 import NftDriverMetadataManager from '../metadata/NftDriverMetadataManager';
 import MetadataManagerBase from '../metadata/MetadataManagerBase';
-import { ethers, MaxUint256, type Signer, toBigInt } from 'ethers';
+import { MaxUint256, type Signer, toBigInt } from 'ethers';
 import GitProjectService from '../project/GitProjectService';
 import assert from '$lib/utils/assert';
 import type { Address, IpfsHash } from '../common-types';
@@ -9,12 +9,6 @@ import { get } from 'svelte/store';
 import Emoji from '$lib/components/emoji/emoji.svelte';
 import type { nftDriverAccountMetadataParser } from '../metadata/schemas';
 import type { LatestVersion } from '@efstajas/versioned-parser';
-import { gql } from 'graphql-request';
-import query from '$lib/graphql/dripsQL';
-import type {
-  MintedNftAccountsCountQuery,
-  MintedNftAccountsCountQueryVariables,
-} from './__generated__/gql.generated';
 import type { Items, Weights } from '$lib/components/list-editor/types';
 import { buildStreamCreateBatchTx } from '../streams/streams';
 import {
@@ -34,6 +28,7 @@ import keyValueToMetatada from '../sdk/utils/key-value-to-metadata';
 import { populateCallerWriteTx } from '../sdk/caller/caller';
 import txToCallerCall from '../sdk/utils/tx-to-caller-call';
 import network from '$lib/stores/wallet/network';
+import calculateSaltFromAddress from '../calc-salt';
 
 type AccountId = string;
 
@@ -113,23 +108,7 @@ export default class DripListService {
       items,
     );
 
-    const mintedNftAccountsCountQuery = gql`
-      query MintedNftAccountsCount($ownerAddress: String!, $chain: SupportedChain!) {
-        mintedTokensCountByOwnerAddress(ownerAddress: $ownerAddress, chain: $chain) {
-          total
-        }
-      }
-    `;
-
-    const mintedNftAccountsCountRes = await query<
-      MintedNftAccountsCountQuery,
-      MintedNftAccountsCountQueryVariables
-    >(mintedNftAccountsCountQuery, { ownerAddress: this._ownerAddress, chain: network.gqlName });
-
-    const salt = this._calcSaltFromAddress(
-      this._ownerAddress,
-      mintedNftAccountsCountRes.mintedTokensCountByOwnerAddress.total ?? 0,
-    );
+    const salt = this._calcSaltFromAddress(this._ownerAddress);
 
     const listId = (
       await executeNftDriverReadMethod({
@@ -368,25 +347,8 @@ export default class DripListService {
     return ipfsHash;
   }
 
-  // We use the count of *all* NFT sub-accounts to generate the salt for the Drip List ID.
-  // This is because we want to avoid making HTTP requests to the subgraph for each NFT sub-account to check if it's a Drip List.
-  private _calcSaltFromAddress = (address: string, listCount: number): bigint /* 64bit */ => {
-    const hash = ethers.keccak256(
-      ethers.AbiCoder.defaultAbiCoder().encode(['string'], [this.SEED_CONSTANT + address]),
-    );
-    const randomBigInt = ethers.toBigInt('0x' + hash.slice(26));
-
-    let random64BitBigInt = BigInt(randomBigInt.toString()) & BigInt('0xFFFFFFFFFFFFFFFF');
-
-    const listCountBigInt = BigInt(listCount);
-    random64BitBigInt = random64BitBigInt ^ listCountBigInt;
-
-    return random64BitBigInt;
-  };
-
-  private _generateDripIdFromSalt = (salt: bigint): number /* 32bit */ => {
-    const random32BitNumber = Number(salt & BigInt(0xffffffff));
-
-    return random32BitNumber;
+  // Create random salt from address
+  private _calcSaltFromAddress = (address: string): bigint /* 64bit */ => {
+    return calculateSaltFromAddress(this.SEED_CONSTANT, address);
   };
 }