Add server Vault account to use for proxying Vault transactions (#140)

Author: zefir-git

src/main/java/pro/cloudnode/smp/bankaccounts/Account.java

@@ -22,6 +22,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -341,9 +342,17 @@ else if (limit != null) {
      * Get the server account
      */
     public static @NotNull Optional<@NotNull Account> getServerAccount() {
-        final @NotNull Account @NotNull [] accounts = get(BankAccounts.getConsoleOfflinePlayer());
-        if (accounts.length == 0) return Optional.empty();
-        return Optional.of(accounts[0]);
+        if (!BankAccounts.getInstance().config().serverAccountEnabled()) return Optional.empty();
+        final @NotNull Optional<@NotNull Account> account = Arrays.stream(get(BankAccounts.getConsoleOfflinePlayer())).filter(a -> a.type != Type.VAULT).findFirst();
+        return account;
+    }
+
+    /**
+     * Get the server Vault account
+     */
+    public static @NotNull Optional<@NotNull Account> getServerVaultAccount() {
+        if (!BankAccounts.getInstance().config().integrationsVaultEnabled()) return Optional.empty();
+        return getVaultAccount(BankAccounts.getConsoleOfflinePlayer());
     }
 
     /**

src/main/java/pro/cloudnode/smp/bankaccounts/BankAccounts.java

@@ -155,6 +155,7 @@ public static void reload() {
         getInstance().setupDbSource();
         getInstance().initDbWrapper();
         createServerAccount();
+        createServerVaultAccount();
         getInstance().getServer().getScheduler().runTaskAsynchronously(getInstance(), () -> checkForUpdates().ifPresent(latestVersion -> {
             getInstance().getLogger().warning("An update is available: " + latestVersion);
             getInstance().getLogger().warning("Please update to the latest version to benefit from bug fixes, security patches, new features and support.");
@@ -329,12 +330,28 @@ public static String formatCurrencyShort(final @Nullable BigDecimal amount) {
      * Create server account, if enabled in config
      */
     private static void createServerAccount() {
-        final @NotNull Account @NotNull [] accounts = Account.get(getConsoleOfflinePlayer());
-        if (accounts.length > 0) return;
-        final @Nullable String name = getInstance().config().serverAccountName();
-        final @NotNull Account.Type type = getInstance().config().serverAccountType();
-        final @Nullable BigDecimal balance = getInstance().config().serverAccountStartingBalance();
-        new Account(getConsoleOfflinePlayer(), type, name, balance, false).insert();
+        if (getInstance().config().serverAccountEnabled()) {
+            final @NotNull Optional<@NotNull Account> account = Account.getServerAccount();
+            if (account.isPresent()) return;
+
+            final @Nullable String name = getInstance().config().serverAccountName();
+            final @NotNull Account.Type type = getInstance().config().serverAccountType();
+            final @Nullable BigDecimal balance = getInstance().config().serverAccountStartingBalance();
+            new Account(getConsoleOfflinePlayer(), type, name, balance, false).insert();
+        }
+    }
+
+    /**
+     * Create server Vault account, if Vault enabled
+     */
+    private static void createServerVaultAccount() {
+        if (getInstance().config().integrationsVaultEnabled()) {
+            final @NotNull Optional<@NotNull Account> serverAccount = Account.getServerVaultAccount();
+            if (serverAccount.isPresent()) return;
+
+            final @Nullable String name = getInstance().config().integrationsVaultServerAccount();
+            new Account(getConsoleOfflinePlayer(), Account.Type.VAULT, name, BigDecimal.ZERO, true);
+        }
     }
 
     /**

src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java

@@ -120,6 +120,11 @@ public boolean integrationsVaultEnabled() {
         return Objects.requireNonNull(config.getString("integrations.vault.description"));
     }
 
+    // integrations.vault.server-account
+    public @NotNull String integrationsVaultServerAccount() {
+        return Objects.requireNonNull(config.getString("integrations.vault.server-account"));
+    }
+
     // currency.symbol
     public @NotNull String currencySymbol() {
         return Objects.requireNonNull(config.getString("currency.symbol"));
@@ -137,6 +142,11 @@ public boolean integrationsVaultEnabled() {
         else return Optional.of(new BigDecimal(Objects.requireNonNull(config.getString("starting-balance"))));
     }
 
+    // server-account.enabled
+    public boolean serverAccountEnabled() {
+        return config.getBoolean("server-account.enabled");
+    }
+
     // server-account.name
     public @NotNull String serverAccountName() {
         return Objects.requireNonNull(config.getString("server-account.name"));

src/main/java/pro/cloudnode/smp/bankaccounts/integrations/VaultIntegration.java

@@ -235,7 +235,7 @@ public boolean has(final @NotNull String player, final @NotNull String world, fi
             if (account.isEmpty()) return new EconomyResponse(amount, 0, EconomyResponse.ResponseType.FAILURE, "Account not found");
             if (!account.get().hasFunds(BigDecimal.valueOf(amount)))
                 return new EconomyResponse(amount, Optional.ofNullable(account.get().balance).map(BigDecimal::doubleValue).orElse(Double.MAX_VALUE), EconomyResponse.ResponseType.FAILURE, "Insufficient funds");
-            final @NotNull Account serverAccount = Account.getServerAccount().orElse(new Account.ClosedAccount());
+            final @NotNull Account serverAccount = Account.getServerVaultAccount().orElse(new Account.ClosedAccount());
             // transfer funds to the server account since Vault just wants them "gone"
             account.get().transfer(serverAccount, BigDecimal.valueOf(amount), BankAccounts.getInstance().config().integrationsVaultDescription(), null);
             // remove funds from the server account without a transaction
@@ -287,7 +287,7 @@ public boolean has(final @NotNull String player, final @NotNull String world, fi
         public @NotNull EconomyResponse depositPlayer(final @NotNull OfflinePlayer player, final double amount) {
             final @NotNull Optional<@NotNull Account> account = Account.getVaultAccount(player);
             if (account.isEmpty()) return new EconomyResponse(amount, 0, EconomyResponse.ResponseType.FAILURE, "Account not found");
-            final @NotNull Account serverAccount = Account.getServerAccount().orElse(new Account.ClosedAccount());
+            final @NotNull Account serverAccount = Account.getServerVaultAccount().orElse(new Account.ClosedAccount());
             // add money to the server account and then transfer it to the player
             serverAccount.updateBalance(BigDecimal.valueOf(amount));
             serverAccount.transfer(account.get(), BigDecimal.valueOf(amount), BankAccounts.getInstance().config().integrationsVaultDescription(), null);

src/main/resources/config.yml

@@ -43,6 +43,10 @@ integrations:
         # Transaction description for all vault operations
         description: Vault Transaction
 
+        # Name of the server Vault account
+        # All Vault transactions will appear as to/from this account.
+        server-account: Server Vault
+
 currency:
     # Currency symbol
     symbol: $
@@ -58,6 +62,9 @@ starting-balance: 0
 
 # Server account
 server-account:
+    # If enabled, when the plugin is loaded an account will be created as player with UUID 00000000-0000-0000-0000-000000000000
+    # This is required for features like interest to work.
+    enabled: true
     # Display name for the server account
     name: Central Bank
     # Account type