Multi tenant

Author: markharding

Common/EntityMutation.php

@@ -1,15 +1,16 @@
 <?php
 namespace Minds\Common;
 
+use Minds\Entities\EntityInterface;
 use Minds\Entities\MutatableEntityInterface;
 use Minds\Helpers;
 
 class EntityMutation
 {
-    /** @var MutatableEntityInterface */
+    /** @var EntityInterface */
     protected $originalEntity;
 
-    /** @var MutatableEntityInterface */
+    /** @var EntityInterface */
     protected $mutatedEntity;
 
     /** @var array */
@@ -118,7 +119,7 @@ public function getMutatedValues(): array
     * Returns the original entity
     * @return MutatableEntityInterface
     */
-    public function getOriginalEntity(): MutatableEntityInterface
+    public function getOriginalEntity(): EntityInterface
     {
         return $this->originalEntity;
     }
@@ -127,7 +128,7 @@ public function getOriginalEntity(): MutatableEntityInterface
      * Returns the fully mutated entity
      * @return MutatableEntityInterface
      */
-    public function getMutatedEntity(): MutatableEntityInterface
+    public function getMutatedEntity(): EntityInterface
     {
         return $this->mutatedEntity;
     }

Common/IpAddress.php

@@ -36,7 +36,7 @@ public function get(): string
         if (is_array($ipHeader) && count($ipHeader)) {
             $ip = strtok($ipHeader[0], ",");
         } else {
-            $ip = 'local';
+            $ip = '127.0.0.1';
         }
         return $ip;
     }

Controllers/Cli/AbuseGuard.php

@@ -13,7 +13,6 @@
 use Minds\Core\Blockchain\EthPrice;
 use Minds\Core\Blockchain\Events\BoostEvent;
 use Minds\Core\Blockchain\Services;
-use Minds\Core\Blockchain\Purchase\Delegates\EthRate;
 use Minds\Core\Blockchain\Transactions\Transaction;
 use Minds\Core\Config\Config;
 use Minds\Core\Di\Di;
@@ -133,66 +132,6 @@ protected function filterCleanup()
         }
     }
 
-    public function testMul()
-    {
-        $manager = Di::_()->get('Blockchain\Purchase\Manager');
-        $amount = "0.006868131868131868";
-        $weiAmount = BigNumber::toPlain($amount, 18)->mul($manager->getEthTokenRate()); //convert to tokens
-        var_dump($weiAmount);
-    }
-
-    public function setRate()
-    {
-        error_reporting(E_ALL);
-        ini_set('display_errors', 1);
-        while (true) {
-            $ethereum = Di::_()->get('Blockchain\Services\Ethereum');
-            $config = Di::_()->get('Config');
-            $ethRate = new EthRate;
-            $ethPrice = new EthPrice;
-            $ethPrice->setFrom(strtotime('24 hours ago'))
-            ->setTo(time())
-            ->get();
-
-            $eth = round($ethPrice->getNearestPrice(strtotime('1 minute ago')));
-            $usd = 1.25;
-
-            $rate = round($eth/$usd);
-            if ($rate % 2 !== 0) {
-                $rate++;
-            }
-        
-            $txHash = $ethereum->sendRawTransaction($config->blockchain['contracts']['token_sale_event']['rate_pkey'], [
-            'from' => $config->blockchain['contracts']['token_sale_event']['rate_address'],
-            'to' => $config->blockchain['contracts']['token_sale_event']['contract_address'],
-            'gasLimit' => BigNumber::_(200000)->toHex(true),
-            'gasPrice' => BigNumber::_(25000000000)->toHex(true),
-            'data' => $ethereum->encodeContractMethod('modifyRate(uint256)', [
-                BigNumber::_($rate)->toHex(true),
-            ])
-        ]);
-
-            // Wait until mined before updating our backend
-
-            while (true) {
-                sleep(1);
-                $receipt = $ethereum->request('eth_getTransactionReceipt', [ $txHash ]);
-                echo "\n Waiting for $txHash";
-                if ($receipt && $receipt['status']) {
-                    if ($receipt['status'] !== '0x1') {
-                        echo "\n$txHash failed";
-                    }
-                    break;
-                }
-            }
-
-            $ethRate->set($rate);
-            echo "\n Completed: new rate is $rate: $txHash";
-            echo "\n Now sleeping for one hour";
-            sleep(3600);
-        }
-    }
-
     public function balance()
     {
         error_reporting(E_ALL);

Controllers/Cli/Blockchain.php

@@ -12,9 +12,6 @@
 use Minds\Core\Email\V2\Campaigns\Recurring\WireSent\WireSent;
 use Minds\Core\Email\V2\Delegates\DigestSender;
 use Minds\Core\Reports;
-use Minds\Core\Blockchain\Purchase\Delegates\IssuedTokenEmail;
-use Minds\Core\Blockchain\Purchase\Delegates\NewPurchaseEmail;
-use Minds\Core\Blockchain\Purchase\Purchase;
 use Minds\Core\Supermind;
 use Minds\Core\Email\V2\Campaigns\Recurring\Supermind\Supermind as SupermindEmail;
 
@@ -280,28 +277,6 @@ public function testHackedAccount()
         }
     }
 
-    public function testTokenPurchase()
-    {
-        $issued = $this->getOpt('issued');
-        $amount = $this->getOpt('amount') ?: 10 ** 18;
-
-
-        $userGuid = $this->getOpt('userGuid');
-        $user = new User($userGuid);
-
-        $purchase = new Purchase();
-        $purchase->setUserGuid($userGuid)
-            ->setRequestedAmount($amount);
-
-        if ($issued) {
-            $delegate = new IssuedTokenEmail();
-        } else {
-            $delegate = new NewPurchaseEmail();
-        }
-
-        $delegate->send($purchase);
-    }
-
     public function testDigest()
     {
         $userGuid = $this->getOpt('userGuid');