Disk billing

libraries/psibase/native/src/NativeFunctions.cpp

@@ -873,9 +873,6 @@ namespace psibase
                 abortMessage("Cannot read from this db handle " + bucket.to_string());
              auto fullKey       = bucket.key(key);
              auto fullMatchSize = bucket.prefix.size() + matchKeySize;
-             if (keyHasServicePrefix(bucket.db))
-                check(fullMatchSize >= sizeof(AccountNumber::value),
-                      "matchKeySize is smaller than 8 bytes");
              return setResult(*this, bucket.trimResult(database.kvGreaterEqualRaw(
                                          bucket.db, fullKey, fullMatchSize)));
           });
@@ -895,9 +892,6 @@ namespace psibase
                 abortMessage("Cannot read from this db handle " + bucket.to_string());
              auto fullKey       = bucket.key(key);
              auto fullMatchSize = bucket.prefix.size() + matchKeySize;
-             if (keyHasServicePrefix(bucket.db))
-                check(fullMatchSize >= sizeof(AccountNumber::value),
-                      "matchKeySize is smaller than 8 bytes");
              return setResult(*this, bucket.trimResult(database.kvLessThanRaw(bucket.db, fullKey,
                                                                               fullMatchSize)));
           });
@@ -913,9 +907,6 @@ namespace psibase
              if (!bucket.isRead())
                 abortMessage("Cannot read from this db handle " + bucket.to_string());
              auto fullKey = bucket.key(key);
-             if (keyHasServicePrefix(bucket.db))
-                check(fullKey.size() >= sizeof(AccountNumber::value),
-                      "key is shorter than 8 bytes");
              return setResult(*this, bucket.trimResult(database.kvMaxRaw(bucket.db, fullKey)));
           });
    }

packages/local/XAdmin/ui/src/hooks/use-network-variables.ts

@@ -9,13 +9,15 @@ interface NetworkVariables {
     blockReplayFactor: number;
     perBlockSysCpuNs: number;
     objStorageBytes: number;
+    subjStorageBytes: number;
 }
 
 const zNetworkVariablesResponse = z.object({
     getNetworkVariables: z.object({
         blockReplayFactor: z.number(),
         perBlockSysCpuNs: z.string(),
         objStorageBytes: z.string(),
+        subjStorageBytes: z.string(),
     }),
 });
 
@@ -28,6 +30,7 @@ export const useNetworkVariables = () => {
                     blockReplayFactor
                     perBlockSysCpuNs
                     objStorageBytes
+                    subjStorageBytes
                 }
             }`;
             const res = await graphql(query, { service: "vserver" });
@@ -43,6 +46,9 @@ export const useNetworkVariables = () => {
                 objStorageBytes: Number(
                     response.getNetworkVariables.objStorageBytes,
                 ),
+                subjStorageBytes: Number(
+                    response.getNetworkVariables.subjStorageBytes,
+                ),
             };
         },
     });

packages/system/Accounts/plugin/accounts/wit/world.wit

@@ -49,7 +49,7 @@ interface api {
 
     /// Sets the auth service used to authenticate the currently logged-in user
     /// Currently calling this is restricted to the homepage app.
-    set-auth-service: func(service-name: string) -> result<_, error>; 
+    set-auth-service: func(service-name: string) -> result<_, error>;
 
     /// Gets the account name of the user logged into the active application.
     /// May also return None if no user is logged in.
@@ -60,6 +60,30 @@ interface api {
     gen-rand-account: func(prefix: option<string>) -> result<string, error>;
 }
 
+/// This interface is only callable by the accounts app itself.
+interface admin {
+    use host:types/types.{error};
+
+    /// Gets the names of all apps to which the user has connected
+    get-connected-apps: func(user: string) -> list<string>;
+
+    /// Adds an account into the accounts table so that it can be used on this device.
+    import-account: func(account: string);
+
+    /// Removes an account from the accounts table and disconnects it from any connected
+    /// apps so that it can no longer be used on this device.
+    remove-account: func(account: string);
+
+    /// Gets a list of all accounts that are known by the accounts app on this device.
+    get-all-accounts: func() -> list<string>;
+
+    /// Get a list of auth accounts
+    get-auth-services: func() -> result<list<string>, error>;
+
+    /// preapprove an account for creation within this transaction
+    preapprove-account: func(account: string);
+}
+
 world imports {
     import api;
     import active-app;

packages/system/Producers/src/Producers.cpp

@@ -10,6 +10,23 @@ using namespace SystemService;
 
 namespace
 {
+   bool isResMonitoring()
+   {
+      return to<Transact>().isResMonitoring();
+   }
+
+   void skipBilling()
+   {
+      if (isResMonitoring())
+         to<Transact>().skipBilling(1);
+   }
+
+   void endSkipBilling()
+   {
+      if (isResMonitoring())
+         to<Transact>().endSkipBilling();
+   }
+
    auto compare_claim = [](const Claim& lhs, const Claim& rhs)
    { return std::tie(lhs.service, lhs.rawData) < std::tie(rhs.service, rhs.rawData); };
 
@@ -112,7 +129,9 @@ namespace SystemService
       status->consensus.next = {{std::move(consensus), status->consensus.current.services,
                                  status->consensus.current.wasmConfig},
                                 status->current.blockNum};
+      skipBilling();
       table.put(*status);
+      endSkipBilling();
    }
 
    void Producers::setProducers(std::vector<psibase::Producer> prods)
@@ -139,7 +158,9 @@ namespace SystemService
                status->consensus.current.data),
            status->consensus.current.services, status->consensus.current.wasmConfig},
           status->current.blockNum};
+      skipBilling();
       table.put(*status);
+      endSkipBilling();
    }
 
    void Producers::regCandidate(const std::string& endpoint, psibase::Claim claim)

packages/system/StagedTx/service/src/db.rs

@@ -249,7 +249,7 @@ pub mod impls {
     }
 
     impl LastUsed {
-        fn get_next_id() -> u32 {
+        pub fn get_next_id() -> u32 {
             let table = LastUsedTable::new();
             let mut last_used = table.get_index_pk().get(&()).unwrap_or_default();
             last_used.id += 1;

packages/system/StagedTx/service/src/lib.rs

@@ -56,7 +56,11 @@ pub mod service {
     #[action]
     fn init() {
         let table = InitTable::new();
-        table.put(&InitRow {}).unwrap();
+
+        if table.get_index_pk().get(&()).is_none() {
+            table.put(&InitRow {}).unwrap();
+            let _ = LastUsed::get_next_id(); // Create this singleton on init instead of first use.
+        }
 
         let updated = MethodNumber::from("updated");
         Events::call().addIndex(EventDb::HistoryEvent, SERVICE, updated, 0); // Index events related to specific txid

packages/system/Transact/include/services/system/Transact.hpp

@@ -444,6 +444,28 @@ namespace SystemService
       /// Enable/disable resource monitoring
       void resMonitoring(bool enable);
 
+      /// Returns true if resource monitoring is enabled
+      bool isResMonitoring();
+
+      /// Suppress billing/tracking for the next `numWrites` disk writes.
+      ///
+      /// Intended for wrapping privileged-service writes that are modified
+      /// by both wasm and native code (e.g. status row). The caller is expected
+      /// to perform exactly `numWrites` writes/frees and then call `endSkipBilling`.
+      ///
+      /// Only callable by privileged services.
+      void skipBilling(uint32_t numWrites);
+
+      /// Asserts that all writes promised by `skipBilling` were consumed.
+      ///
+      /// Only callable by privileged services.
+      void endSkipBilling();
+
+      /// Attribute subsequent disk writes to the system account until `numBytes`
+      /// bytes have been written or the transaction ends. `numBytes = 0` clears
+      /// the override. Callable only by the VirtualServer service.
+      void systemWrite(uint64_t numBytes);
+
       /// Get the currently executing transaction
       psio::view<const psibase::Transaction> getTransaction() const;
 
@@ -485,6 +507,7 @@ namespace SystemService
       };
    };
    PSIO_REFLECT(Transact,
+                allowHashedMethods(),
                 method(startBoot, bootTransactions),
                 method(finishBoot),
                 method(startBlock),
@@ -497,6 +520,10 @@ namespace SystemService
                 method(runAs, action, allowedActions),
                 method(checkFirstAuth, id, transaction),
                 method(resMonitoring, enable),
+                method(isResMonitoring),
+                method(skipBilling, numWrites),
+                method(endSkipBilling),
+                method(systemWrite, numBytes),
                 method(getTransaction),
                 method(isTransaction),
                 method(currentBlock),