use dynamic storage on accountId length

near · Oct 11, 2022 · 0f05f83 · 0f05f83
1 parent 972cb40
commit 0f05f83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/examples/__tests__/test-fungible-token.ava.js b/examples/__tests__/test-fungible-token.ava.js
@@ -5,7 +5,7 @@ test.beforeEach(async (t) => {
   const worker = await Worker.init();
 
   const totalSupply = 1000;
-  const yoctoAccountStorage = "324";
+  const yoctoAccountStorage = "45";
 
   const root = worker.rootAccount;
   const xcc = await root.devDeploy("./build/fungible-token-helper.wasm");
@@ -110,7 +110,7 @@ test("should return message when trying to pay for storage with less than the re
     ft,
     "storage_deposit",
     { account_id: alice.accountId },
-    { attachedDeposit: NEAR.from("100").toJSON() }
+    { attachedDeposit: NEAR.from("40").toJSON() }
   );
   t.is(
     result.message,

diff --git a/examples/src/fungible-token.ts b/examples/src/fungible-token.ts
@@ -24,13 +24,15 @@ export class FungibleToken {
     this.accounts.set(owner_id, this.totalSupply);
   }
 
-  internalGetMaxAccountStorageUsage(): bigint {
+  internalGetAccountStorageUsage(accountLength: number): bigint {
     const initialStorageUsage = near.storageUsage();
     const tempAccountId = "a".repeat(64);
     this.accounts.set(tempAccountId, "0");
-    const maxAccountStorageUsage = near.storageUsage() - initialStorageUsage;
+    const len64StorageUsage = near.storageUsage() - initialStorageUsage;
+    const len1StorageUsage = len64StorageUsage / BigInt(64);
+    const lenAccountStorageUsage = len1StorageUsage * BigInt(accountLength);
     this.accounts.remove(tempAccountId);
-    return maxAccountStorageUsage * BigInt(3); // we create an entry in 3 maps
+    return lenAccountStorageUsage * BigInt(3); // we create an entry in 3 maps
   }
 
   internalRegisterAccount({
@@ -120,7 +122,7 @@ export class FungibleToken {
       }
       return { message: "Account is already registered" };
     }
-    const storageCost = this.internalGetMaxAccountStorageUsage();
+    const storageCost = this.internalGetAccountStorageUsage(accountId.length);
     if (attachedDeposit < storageCost) {
       this.internalSendNEAR(near.predecessorAccountId(), attachedDeposit);
       return {