From 256b66de41b2cd8dcdeb39fc5f080c5ff957e5d2 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 7 Jan 2024 15:50:50 +0000
Subject: [PATCH] Revert "DB update 1260 - REQUIRES SODIUM PHP EXTENSION!!!"

This reverts commit 5ee4f37b8d2bfaee253e0e65acb74a414c602a33
---
 Zotlabs/Update/_1260.php | 46 ----------------------------------------
 boot.php                 |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 Zotlabs/Update/_1260.php

diff --git a/Zotlabs/Update/_1260.php b/Zotlabs/Update/_1260.php
deleted file mode 100644
index 1e1f1ebf0..000000000
--- a/Zotlabs/Update/_1260.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-namespace Zotlabs\Update;
-
-class _1260 {
-	public function run() {
-
-		$has_sodium = function_exists('sodium_crypto_sign_keypair');
-
-		if (!$has_sodium) {
-			return UPDATE_FAILED;
-		}
-
-		q("START TRANSACTION");
-
-		$r1 = q("ALTER TABLE channel ADD channel_epubkey text NOT NULL");
-		$r2 = q("ALTER TABLE channel ADD channel_eprvkey text NOT NULL");
-
-		$channels = q("select channel_id from channel where true");
-		if ($channels) {
-			foreach ($channels as $channel) {
-				$keys = sodium_crypto_sign_keypair();
-				$pubkey = sodium_bin2base64(sodium_crypto_sign_publickey($keys), SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING);
-				$prvkey = sodium_bin2base64(sodium_crypto_sign_secretkey($keys), SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING);
-				q("update channel set channel_epubkey = '%s', channel_eprvkey = '%s' where channel_id = %d",
-					dbesc($pubkey),
-					dbesc($prvkey),
-					intval($channel['channel_id'])
-				);
-			}
-		}
-
-		if ($r1 && $r2) {
-			q("COMMIT");
-			return UPDATE_SUCCESS;
-		}
-
-		q("ROLLBACK");
-		return UPDATE_FAILED;
-	}
-
-	public function verify() {
-		$columns = db_columns('channel');
-		return in_array('channel_epubkey', $columns) && in_array('channel_eprvkey', $columns);
-	}
-}
-
diff --git a/boot.php b/boot.php
index 6c1c43704..a1528e58d 100644
--- a/boot.php
+++ b/boot.php
@@ -65,7 +65,7 @@ define('PLATFORM_NAME', 'hubzilla');
 define('STD_VERSION', '8.9.1');
 define('ZOT_REVISION', '6.0');
 
-define('DB_UPDATE_VERSION', 1260);
+define('DB_UPDATE_VERSION', 1259);
 
 define('PROJECT_BASE', __DIR__);