add WHALE20201026 to robot.sh

bcoin_io/robot.php

@@ -2,6 +2,8 @@
 
 $url = 'http://x:m3lch1s3d3k@127.0.0.1:8332';
 
+$url = 'http://bitcoinrpc:EF/iNKFWzQkpoTB+VFaSGk1+qZPckHsLfKu+3HZddpRr@77.159.16.114:8332';
+
 $data = array("method" => "getbestblockhash");
 $json_data = json_encode($data);
 

blockchain/cache.php

@@ -1,50 +0,0 @@
-<?php
-
-// ---
-// --- Listening to blockchain.info to get the last block
-// ---
-
-// ---
-// --- La config globale
-// ---
-require_once '../global/inc/config.php';
-
-// ---
-// --- Internal dependances
-// ---
-require_once 'inc/block.php';
-
-// ---
-// --- Par défaut on cherche le dernier block
-// ---
-$block_hash = 'LAST';
-
-// ---
-// --- On interroge la blockchain
-// ---  => Ce qui a pour effet de placer le block dans le cache
-// ---
-$the_block = blockchain::getSpecialBlock($block_hash);
-if ($the_block === FALSE) die();
-
-// ---
-// --- On en recherche 3 sur approximativement 6 heures (36 blocks)
-// ---
-$max  = 3;
-$max2 = 36;
-while(($max > 0)&&($max2 > 0))
-{
-        $block_hash = $the_block->prev_block;
-
-        if (!file_exists(DATA_PATH.'/json/'.$block_hash.'.zip'))
-        {
-        	$max--;
-        	echo 'CACHE '.$block_hash.' '.($the_block->height-1)." ".$the_block->n_tx.PHP_EOL;
-        }
-
-        $the_block = blockchain::getBlockWithHash($block_hash);
-        if ($the_block === FALSE) die();
-        
-        $max2--;
-}
-
-?>

blockchain/controle_cache.php

@@ -1,46 +0,0 @@
-<?php
-
-// ---
-// --- Listening to blockchain.info to get the last block
-// ---
-
-// ---
-// --- La config globale
-// ---
-require_once '../global/inc/config.php';
-
-// ---
-// --- Internal dependances
-// ---
-require_once 'inc/block.php';
-
-// ---
-// --- On interroge la blockchain
-// ---  => Ce qui a pour effet de placer le block dans le cache
-// ---
-$block_hash = blockchain::getLastBlockHash();
-if ($block_hash === FALSE) die();
-echo 'LAST '.$block_hash.' ZIP OK PNG OK';
-
-for($i=0;$i<36;$i++)
-{
-        $the_block = blockchain::getBlockWithHash($block_hash);
-        if ($the_block === FALSE) die();
-
-        echo ' '.$the_block->height.PHP_EOL;
-        if ($i == 35) break;
-
-        $block_hash = $the_block->prev_block;
-        echo 'PREV '.$block_hash.' ';
-
-        echo 'ZIP ';
-        if (file_exists(DATA_PATH.'/json/'.$the_block->hash.'.zip')) echo 'OK ';
-        else echo 'KO ';
-
-        echo 'PNG ';
-        if (file_exists(DATA_PATH.'/hasard/'.$the_block->hash.'.png')) echo 'OK';
-        else echo 'KO';
-}
-
-?>
-~                        

blockchain/inc/block.php

@@ -1,5 +1,21 @@
 <?php
 
+class block
+{
+  public $hash   = null;
+  public $height = null;
+  public $name   = null;
+  public $desc   = null;
+  
+  function __construct($ahash, $aheight, $aname = null, $adesc = null)
+  {
+    $this->hash   = $ahash;
+    $this->height = $aheight;
+    $this->name   = $aname;
+    $this->desc   = $adesc;
+  }
+}
+
 class blockchain
 {
   private static $url_info = 'https://blockchain.info/fr';
@@ -9,8 +25,11 @@ class blockchain
    *
    * 'GENESIS'      - Premier block de la blochain
    * 'THE_ANSWER'   - Block 42 (pour le fun)
+   * 'HAL_FINLEY'   - Hal Finley has mined this block
+   * 'FIRST_TX'     - First exchange between Satoshi and Hal Finley
    * 'LUCIFER'      - Block 666 (pour le fun)
    * 'LEET'         - Block 1337 (pour le fun)
+   * 'FISRT_USD_TX' - Martti Malmi change 5000 BTC for 5,02 $
    * 'PIZZA'        - Block 57035 : le block du pizza day, 22 05 2010
    * 'HALVING_1'    - First halving, block 2100000, 28 11 2012
    * 'HALVING_2'    - Second halving, block 420000, 09 07 2017
@@ -18,33 +37,269 @@ class blockchain
    * 'BCC'          - Block 478558 : Bitcoin Cash Fork 01/08/2017
    * 'SEGWIT_LOCK'  - Block 479808 SEGWIT est verrouillé 09 08 2017
    * 'SEGWIT'       - Block 481823 SEGWIT est activé 24 08 2017
+   * 'HALVING_3'    - Third Hhalving, block 630000, 11 05 2020
+   * 'DORMEUR'      - Block 631058 Une adresse datant de 2009 dépense ses 50 BTC de reward
+   *                 TX : cb1440c787d8a46977886405a34da89939e1b04907f567bf182ef27ce53a8d71
+   *
+   *  ____JUMP______ : Lorsque le cours atteint certains palier (à la hausse ou à la baisse)
+   *  WHALE____   : Lorsqu'une baleine remonte respirer (grosse TX)
+   *  GOLGOTH____ : Lorsque le GOLGOTH pousse fort ... (grosse TX)
    */
-  private static $special_blocks = array (
+  private static $special_blocks = null;
-    'GENESIS'     => '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f',
+
-    'THE_ANSWER'  => '00000000314e90489514c787d615cea50003af2023796ccdd085b6bcc1fa28f5',
+  // ----
-    'LUCIFER'     => '00000000fc5b3c76f27f810ee775e480ae7fd604fd196b2d8da4257fcd39f4f9',
+  // --   Des fonctions outils
-    'LEET'        => '000000008bf44a528a09d203203a6a97c165cf53a92ecc27aed0b49b86a19564',
+  // --   Parce que depuis PHP.7.0.33-10, file_get_contents ne focnitonne plus en HTTPS
-    'TOPISTO'     => '000000000a73e64735a2b75c97ea674950a9018da1420d01328a918c9ff9852c',
+  // ----
-    'PIZZA'       => '00000000006de085dadb3ec413ef074022fe781121b467e98960280dd246bb00',
+  private static function get_curl_data($url)
-    'HALVING_1'   => '000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e',
+  {
-    'HALVING_2'   => '000000000000000002cce816c0ab2c5c269cb081896b7dcb34b8422d6b74ffa1',
+    $ch = curl_init();
-    'BIP_91_LOCK' => '0000000000000000015411ca4b35f7b48ecab015b14de5627b647e262ba0ec40',
+    $timeout = 5;
-    'BCC'         => '00000000000000000019f112ec0a9982926f1258cdcc558dd7c3b7e5dc7fa148',
+    curl_setopt($ch,CURLOPT_URL,$url);
-    'SEGWIT_LOCK' => '0000000000000000012e6060980c6475a9a8e62a1bf44b76c5d51f707d54522c',
+    curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);
-    'SEGWIT'      => '000000000000000000cbeff0b533f8e1189cf09dfbebf57a8ebe349362811b80',
+    curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,$timeout);
-    'HURRICANE_1' => '0000000000000000000fe6d521a187a5523d5cef6f6c178923ff82ffe5a0f372',
+    $data = curl_exec($ch);
-    'WHALE201810' => '0000000000000000000f9f2dadfb8f312572183272802cbfcc4ff95b4ee6777d',
+    curl_close($ch);
-    'BLOCK21E800' => '00000000000000000021e800c1e8df51b22c1588e5a624bea17e9faa34b2dc4a'   
+    return $data;
+  }
+
+  private static function get_data($url, $with_curl = true)
+  {
+    if (!$with_curl)
+        return file_get_contents($url);
+
+    return self::get_curl_data($url);
+  }
+
+  //
+  // Init special blocks array ...
+  // 
+  public static function init()
+  {
+    self::$special_blocks = array ();
+
+    self::$special_blocks[] = new block(
+      '000000000000000000070daa5861fe1e7064ef8007825431229c6c1cab2c766f',
+      654364,
+      'WHALE20201026'
     );
 
+    self::$special_blocks[] = new block(
+      '00000000000000000005c0f74e8b00c3961d6dfbf32936edeaa300015949f3c4',
+      632676,
+      '2020JUMP10000'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000000000000000f811e171eee52157e9a95963140e62fa83610f23ea7e',
+      631058,
+      'DORMEUR'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000000000024bead8df69990852c202db0e0097c1a12ea637d7e96d',
+      630000,
+      'HALVING_3'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000001186079bbf9a5d945231236135af7a766bd34d814e7319',
+      628710,
+      'RIP_STEEVE'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000000000099457d2aeb2b7fc8ad8adb1490814cb674dc5767ae9b9',
+      622453,
+      'COVID19'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000000000000001a3c68111789a6c2cc76f1209d1dae63b05460053eb2b',
+      619165,
+      'EQUILIBRE202002'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000000f2306f08e8f34872a24dfaad3423801a91ee1626e9ea4',
+      618986,
+      'SOPHIA202002'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000001085a869441fa2aa77f149a887af0ce59846ef51da6e4c',
+      616193,
+      'EQUILIBRE'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000000b05f877e6e49b380f4f78b3cfb605b67439f825dba197',
+      613470,
+      '2020JUMP9000'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000000000000009e8fb4ac719a362c1c4e3df439740069ee58e2a713258',
+      612149,
+      'DEMISSION20200110'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000000000051f84a7a1d0f5b2ddaf5682cbec5f7acb2bf5fa339725',
+      593879,
+      'GOLGOTH201909'
+    );
+
+    // 94 500 BTC, soit environ 1 milliards de dollars, 700 dollars de fees ...
+    self::$special_blocks[] = new block(
+      '00000000000000000014fcb29e6e3b0ead3bd2e307d7f619a935f1d5323e9013',
+      593468,
+      'WHALE201909'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000000f9f2dadfb8f312572183272802cbfcc4ff95b4ee6777d',
+      545911,
+      'WHALE201810'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000000000000021e800c1e8df51b22c1588e5a624bea17e9faa34b2dc4a',
+      528249,
+      'BLOCK21E800'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000000fe6d521a187a5523d5cef6f6c178923ff82ffe5a0f372',
+      506734,
+      'HURRICANE_1'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000000000cbeff0b533f8e1189cf09dfbebf57a8ebe349362811b80',
+      481823,
+      'SEGWIT'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000012e6060980c6475a9a8e62a1bf44b76c5d51f707d54522c',
+      479808,
+      'SEGWIT_LOCK'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000000000000019f112ec0a9982926f1258cdcc558dd7c3b7e5dc7fa148',
+      478559,
+      'BCC'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000000015411ca4b35f7b48ecab015b14de5627b647e262ba0ec40',
+      477120,
+      'BIP_91_LOCK'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000000002cce816c0ab2c5c269cb081896b7dcb34b8422d6b74ffa1',
+      420000,
+      'HALVING_2'
+    );
+
+    self::$special_blocks[] = new block(
+      '0000000000000001bc7156dd1183c87859b326affa3a5cdd157e809537f0b284',
+      270953,
+      'WHALE201311'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e',
+      210000,
+      'HALVING_1'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000000041c718cd2fa4270ab80c917bb94caa79c84b417b7924a867a68',
+      196883,
+      'JOHN_CONWAY'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000006de085dadb3ec413ef074022fe781121b467e98960280dd246bb00',
+      57035,
+      'PIZZA'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000132fbe8314fc571c0be60b31ccd461c9ee85f42bde8c6d160a9dacc0',
+      24835,
+      'FIRST_USD_TX'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000a73e64735a2b75c97ea674950a9018da1420d01328a918c9ff9852c',
+      5637,
+      'TOPISTO'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000a70ba4a405c67310757606dd955cf1a3a8e5c042335d78394ea6cb67',
+      3654,
+      'DORMEUR_ORIGINE'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000008bf44a528a09d203203a6a97c165cf53a92ecc27aed0b49b86a19564',
+      1337,
+      'LEET'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000fc5b3c76f27f810ee775e480ae7fd604fd196b2d8da4257fcd39f4f9',
+      666,
+      'LUCIFER'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000d1145790a8694403d4063f323d499e655c83426834d4ce2f8dd4a2ee',
+      170,
+      'FIRST_TX'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000a2886c95400fd3b263b9920af80b118b28fee5d2a162a18e4d9d8b2f',
+      78,
+      'HAL_FINLEY'
+    );
+
+    self::$special_blocks[] = new block(
+      '00000000314e90489514c787d615cea50003af2023796ccdd085b6bcc1fa28f5',
+      42,
+      'THE_ANSWER'
+    );
+
+    self::$special_blocks[] = new block(
+      '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f',
+      0,
+      'GENESIS'
+    );
+  }
+
   // ---
-  // --- Retourne le nom d'un block à partie de son hash
+  // --- Retourne le JSON du tableau des blocs speciaux
+  // --- 
+  public static function getSpecialBlocksJSON()
+  {
+    return json_encode(self::$special_blocks);
+  }
+
+  // ---
+  // --- Retourne le nom d'un block à partir de son hash
   // ---   si ce n'est pas un block special, on renvoie le hash
   // --- 
   public static function hash2SpecialName($block_hash)
   {
-    foreach(self::$special_blocks as $key => $value)
+    foreach(self::$special_blocks as $value)
-      if ($block_hash == $value) return $key;
+      if ($block_hash == $value->hash) return $value->name;
 
     return $block_hash;
   }
@@ -58,7 +313,14 @@ class blockchain
   {
     $block_hash = '';
 
-    if (isset(self::$special_blocks[$nom_du_block])) $block_hash = self::$special_blocks[$nom_du_block];
+    foreach(self::$special_blocks as $value)
+    {
+      if ($nom_du_block == $value->name) 
+      {
+        $block_hash = $value->hash;
+        break;
+      }
+    }
 
     if (file_exists(self::$offline_block)) $block_hash = 'offline';
 
@@ -77,7 +339,7 @@ class blockchain
     if (isset($myarray[0]))
     {
       usort( $myarray, function( $a, $b ) { return filemtime($b) - filemtime($a); } );
-      return substr(basename($myarray[0],'.png'),0,strlen(self::$special_blocks['GENESIS']));
+      return substr(basename($myarray[0],'.png'),0,strlen(self::$special_blocks[0]->hash));
     }
 
     // S'il n'y a rien dans le cache d'images
@@ -106,7 +368,7 @@ class blockchain
     if (file_exists(self::$offline_block)) return 'offline';
 
     $filename=self::$url_info.'/latestblock';
-    $message = file_get_contents($filename);
+    $message=self::get_data($filename);
     if ($message === FALSE) return FALSE;
     $the_block = json_decode($message);
     return $the_block->hash;
@@ -123,7 +385,7 @@ class blockchain
       if (!file_exists(DATA_PATH."/json/$block_hash.zip"))
       {
       	$filename=self::$url_info.'/rawblock/'.$block_hash;
-      	$message = file_get_contents($filename);
+      	$message=self::get_data($filename);
       	if ( $message === FALSE ) return FALSE;
       	$the_block = json_decode($message);
       	return self::saveBlockInTmpDir($the_block);
@@ -140,6 +402,14 @@ class blockchain
   {
     if (file_exists(DATA_PATH.'/json/'.$the_block->hash.'.zip')) return $the_block;
 
+    // Blockchain.info renvoie des nonces négatifs
+    // Je repasse par la forme binaire pour retrouver
+    // une valeur positive
+    $the_block->nonce_binary_str = decbin($the_block->nonce);
+    if (strlen($the_block->nonce_binary_str) > 32) $the_block->nonce_binary_str = substr($the_block->nonce_binary_str,-32,32);
+    $the_block->topisto_nonce_blockchain_info = $the_block->nonce;
+    $the_block->nonce = bindec($the_block->nonce_binary_str);   
+
     if (!isset($the_block->topisto_inputs))
     {
       $the_block->topisto_inputs  = 0;
@@ -240,6 +510,19 @@ class blockchain
         [240,147,43],
         [255,255,255]
       ],
+      //  pour splinelineblack
+      [
+        [17,61,86],
+        [254,254,254]
+      ],
+      [
+        [17,61,86],
+        [255,134,63]
+      ],
+      [
+        [234,220,207],
+        [127,106,85]
+      ],
       [
         [48,51,107],
         [255,255,255]
@@ -267,7 +550,7 @@ class blockchain
     ];
 
     $color = $couleur;
-    if ($color == -1) $color = rand(0,count($color_tab)-1);
+    if (($color == -1) || ($color > (count($color_tab)-1))) $color = rand(0,count($color_tab)-1);
 
     // Rajout des HASHES
     $white = imagecolorallocate($vImage, 254, 254, 254);
@@ -442,4 +725,6 @@ class blockchain
   }  
 }
 
+blockchain::init();
+
 ?>

blockchain/include.php

@@ -1,5 +0,0 @@
-<?php
-
-foreach (glob("/opt/Twitterbot/inc/*.php") as $filename) require_once($filename);
-
-?>

blockchain/last.php

@@ -1,47 +0,0 @@
-<?php
-
-// ---
-// --- Listening to blockchain.info to get the last block
-// ---
-
-// ---
-// --- La config globale
-// ---
-require_once '../global/inc/config.php';
-
-// ---
-// --- Internal dependances
-// ---
-require_once 'inc/block.php';
-
-// ---
-// --- On interroge la blockchain
-// ---  => Ce qui a pour effet de placer le block dans le cache
-// ---
-block_hash = blockchain::getLastCacheBlockHash();
-if ($block_hash === FALSE) die();
-$the_block = blockchain::getBlockWithHash($block_hash);
-echo 'LAST '.$block_hash.' '.$the_block->height.PHP_EOL;
-
-$block_hash = blockchain::getLastBlockHash();
-if ($block_hash === FALSE) die();
-$the_block = blockchain::getBlockWithHash($block_hash);
-echo 'LAST '.$block_hash.' '.$the_block->height.PHP_EOL;
-
-$the_block = blockchain::getSpecialBlock('LAST');
-if ($the_block === FALSE) die();
-echo 'LAST '.$the_block->hash." ".$the_block->height.PHP_EOL;
-
-$max = 0;
-// On se met en retard d'au moins un bloc ...
-while(!file_exists(DATA_PATH.'/json/'.$the_block->hash.'.zip'))
-{
-        $block_hash = $the_block->prev_block;
-        $the_block = blockchain::getBlockWithHash($block_hash);
-        if ($the_block === FALSE) die();
-        // Mais pas plus de 5 blocs de retard ...
-        $max += 1;if ($max > 5) break;
-}
-echo 'LAST '.$the_block->hash." ".$the_block->height.PHP_EOL;
-
-?>

blockchain/robot.php

@@ -24,29 +24,24 @@ $block_hash = 'LAST';
 // ---
 if (isset($argv[1])) $block_hash = $argv[1];
 
-echo $block_hash.' ';
-
 // ---
 // --- On interroge la blockchain
 // ---  => Ce qui a pour effet de placer le block dans le cache
 // ---
 $the_block = blockchain::getSpecialBlock($block_hash);
 if ($the_block === FALSE) die();
+echo $block_hash.' '.$the_block->hash." ".$the_block->height." ".$the_block->n_tx.PHP_EOL;
 
 if ($block_hash == 'LAST')
 {
-	$max = 0;
+	// On a demandé le dernier block
-	// On se met en retard d'au moins un bloc ...
+	// On remonte sur les huits derniers pour accélerer les prochaines navigations
-	while(!file_exists(DATA_PATH.'/json/'.$the_block->hash.'.zip'))
+  for($max=0;($max<8)&&(!file_exists(DATA_PATH.'/json/'.$the_block->prev_block.'.zip'));$max++)
 	{
 		$block_hash = $the_block->prev_block;
-		$the_block = blockchain::getSpecialBlock($block_hash);
+		$the_block = blockchain::getBlockWithHash($block_hash);
 		if ($the_block === FALSE) die();
-		// Mais pas plus de 5 blocs de retard ...
+		echo 'CACHE '.$the_block->hash." ".$the_block->height." ".$the_block->n_tx.PHP_EOL;
-		$max += 1;if ($max > 5) break;
 	}
 }
-
-echo $the_block->hash." ".$the_block->height." ".$the_block->n_tx.PHP_EOL;
-
 ?>

blockchain/robot.sh

@@ -11,13 +11,28 @@ touch $flag
 
 cd $APPS_PATH/blockchain
 
-rm -f $DATA_PATH/block_list.txt
+rm -f $DATA_PATH/block_list.tmp
 
-php cache.php >> $DATA_PATH/block_list.txt
+LISTBLOCKS="GENESIS THE_ANSWER LUCIFER LEET        \
+            TOPISTO PIZZA HALVING_1 WHALE201311    \
+            JOHN_CONWAY DORMEUR_ORIGINE            \
+            HALVING_2 BIP_91_LOCK BCC SEGWIT_LOCK  \
+            SEGWIT HURRICANE_1 WHALE201810         \
+            WHALE201909 WHALE20201026              \
+            BLOCK21E800 GOLGOTH201909 EQUILIBRE    \
+            DEMISSION20200110 2020JUMP9000         \
+            SOPHIA202002 EQUILBIRE202002 COVID19   \
+            RIP_STEEVE HALVING_3 DORMEUR           \
+            FIRST_USD_TX 2020JUMP10000             \
+            LAST"
 
-for BLOCK in GENESIS THE_ANSWER LUCIFER LEET TOPISTO PIZZA HALVING_1 HALVING_2 BIP_91_LOCK BCC SEGWIT_LOCK SEGWIT HURRICANE_1 WHALE201810 BLOCK21E800 LAST
+for BLOCK in $LISTBLOCKS
 do
-  php robot.php $BLOCK >> $DATA_PATH/block_list.txt
+  php robot.php $BLOCK >> $DATA_PATH/block_list.tmp
 done
 
+# Sort the block list by Height
+sort -k3 -n $DATA_PATH/block_list.tmp > $DATA_PATH/block_list.txt
+
+rm -f $DATA_PATH/block_list.tmp
 rm -f $flag

lancer2.sh

@@ -11,5 +11,7 @@ export FLAG_PATH=$APPS_PATH/../flags
 MINUTE=`date +%M`
 DATE=`date +%Y%m%d0000`
 
-source scripts/blocks2.sh
+if [ -f scripts/$1.sh ];
-
+then
+    source scripts/$1.sh
+fi

methode/hashes/robot.php

@@ -51,7 +51,7 @@ $img_h = $height+(2*$bandeau);
 // création d'une image plus haute pour inclure bandeaux haut et bas
 $img = imagecreatetruecolor($img_w, $img_h);
 
-$paramHeader = blockchain::DrawBlockHeaderFooter($the_block, $img, $bandeau);
+$paramHeader = blockchain::DrawBlockHeaderFooter($the_block, $img, $bandeau, $mode);
 
 imagefilledrectangle($img, 0, $bandeau, $width, $bandeau + $height, $paramHeader[2]);
 

methode/hashes/robot.sh

@@ -11,24 +11,12 @@ fi
 touch $flag
 
 cd $APPS_PATH/methode/$METHODE
-for BLOCK in `grep LAST $DATA_PATH/block_list.txt | awk '{print $2}'`
+for BLOCK in `awk '{print $2}' $DATA_PATH/block_list.txt`
 do
   if [ ! -f $DATA_PATH/$METHODE/$BLOCK.png ]
   then
-    BLOCK_HEIGHT=`grep $BLOCK $DATA_PATH/block_list.txt | awk '{print $3}'`
+    php robot.php $BLOCK 99999
-    php robot.php $BLOCK $((RANDOM % 6))
-
-    echo $BLOCK_HEIGHT $BLOCK >> $DATA_PATH/hashes2hashes/liste.txt
   fi
-
-  BNAME=`grep $BLOCK $DATA_PATH/block_list.txt | awk '{print $1}'`
-  if [ "$BNAME" == "LAST" ]
-  then
-    touch $DATA_PATH/$METHODE/$BLOCK.png
-  else
-    touch -t $date $DATA_PATH/$METHODE/$BLOCK.png
-  fi
-
 done
 
 rm -f $flag

methode/hashes2hashes/robot.php

@@ -14,11 +14,27 @@ require_once '../../global/inc/config.php';
 // ---
 require TOPISTO_PATH.'/ressources/vendor/autoload.php';
 
+// ---
+// --- Internal dependances
+// ---
+require_once APP_PATH.'/blockchain/inc/block.php';
+
+// ---
+// --- Par défaut on cherche le dernier block
+// ---
+$block_hash = 'LAST';
+
+// ---
+// --- Le cas échéant, on cherche block passé en argument
+// ---
+if (isset($argv[1])) $block_hash = $argv[1];
+
+$nb_max=6;
+if (isset($argv[2])) $nb_max=intval($argv[2]);
+
 $width       = 840;
 $height      = 104;
 $final_hash  = 'default';
-$nb_max      = 6;
-$numprev     = 0;
 
 $img = imagecreatetruecolor($width, $height*$nb_max);
 
@@ -29,41 +45,26 @@ $tr = imagecolorallocate($img, 220, 220, 220);
 imagecolortransparent($img, $tr);
 imagefilledrectangle($img, 0, 0, $width, $height*$nb_max, $tr);
 
-$handle = fopen(DATA_PATH.'/hashes2hashes/liste.txt', 'r');
+for($i=0; $i<$nb_max; $i++)
-if ($handle) {
+{
-  while (($nb_max > 0)&&(($hash = fgets($handle, 4096)) !== false)) {
+  $the_block = blockchain::getBlockWithHash($block_hash);
+  if ($the_block === FALSE) die();
  
-    $hash = preg_replace('~[[:cntrl:]]~', '', $hash);
+  $block_hash = $the_block->prev_block;
-    $split = explode(' ', $hash);
-    $numero = intval($split[0]);
-    $hash   = $split[1];
 
-    if ($final_hash == 'default') $final_hash = $hash;
+  $hash=DATA_PATH.'/hashes/'.$the_block->hash.'.png';
+  if ($final_hash  == 'default') $final_hash = $the_block->hash;
 
-    if (($numprev != 0) && ($numprev != ($numero - 1))) {
-      imagefilledrectangle($img, 0, $height*$nb_max, $width, $height*($nb_max-1), $gris);
-      imagerectangle($img, 0, $height*$nb_max, $width, $height*($nb_max-1), $noir);
-      echo $nb_max.' '.($numprev+1).' manquant !'.PHP_EOL;
-      $nb_max -= 1;
-    }
-    $numprev = $numero;
-
-    $nb_max -= 1;
-    echo $nb_max.' '.$numero.' '.$hash.PHP_EOL;
-
-    $hash = DATA_PATH.'/hashes/'.$hash.'.png';
   if (file_exists($hash))
   {
     $src_img = imagecreatefrompng($hash);
     if ($src_img) 
     {
-        if (FALSE === imagecopy($img, $src_img, 0, $height*$nb_max, 0, 0, $width, $height))
+      if (FALSE === imagecopy($img, $src_img, 0, ($height*$i), 0, 0, $width, $height))
         echo "Erreur : problème de copie image".PHP_EOL;
     } else echo "Erreur: ".$hash." ne semble pas être une image PNG".PHP_EOL;
   } else echo "Erreur: ".$hash." n'a pas été trouvé".PHP_EOL;
 }
-  fclose($handle);
-} else echo "Erreur: fopen('".DATA_PATH."/hashes2hashes/liste.txt') a échoué".PHP_EOL;
 
 imagepng($img, DATA_PATH.'/hashes2hashes/'.$final_hash.'.png');
 

methode/hashes2hashes/robot.sh

@@ -11,20 +11,16 @@ fi
 touch $flag
 
 cd $APPS_PATH/methode/$METHODE
+SIZE=6
+BLOCK=`grep LAST $DATA_PATH/block_list.txt | awk '{print $2}'`
+HEIGHT=`grep LAST $DATA_PATH/block_list.txt | awk '{print $3}'`
 
-mv $DATA_PATH/$METHODE/liste.txt $DATA_PATH/$METHODE/liste.new
+if [ $((HEIGHT % SIZE)) -eq 0 ]
-sort -k1 -n $DATA_PATH/$METHODE/liste.new > $DATA_PATH/$METHODE/liste.txt
-rm -f $DATA_PATH/$METHODE/liste.new
-
-BLOCK=`head -n 1 $DATA_PATH/$METHODE/liste.txt | awk '{print $2}'`
-COMPTEUR=`wc -l $DATA_PATH/$METHODE/liste.txt | awk '{print $1}'`
-
-if [ $COMPTEUR -gt 5 ]
 then
-  php robot.php
+  if [ ! -f $DATA_PATH/$METHODE/$BLOCK.png ]
-  
+  then
-  rm -f $DATA_PATH/$METHODE/liste.old
+    php robot.php $BLOCK $SIZE
-  mv $DATA_PATH/$METHODE/liste.txt $DATA_PATH/$METHODE/liste.old
+  fi
 fi
 
 rm -f $flag

methode2/circle/draw.php

@@ -14,6 +14,7 @@ function DrawBlock($the_block, $vImage, $parametres)
   $marge_x = 10;
   $marge_y = 10;
   $facteur_max = 2.5;
+  $alpha   = 0;
 
   // Détermine si on dessine les tx, les fees ou la récompense
   if (isset($parametres['type']))             $type    = $parametres['type'];

methode2/circle_line/draw.php

@@ -14,6 +14,7 @@ function DrawBlock($the_block, $vImage, $parametres)
   $marge_x = 10;
   $marge_y = 10;
   $facteur_max = 2.5;
+  $alpha   = 0;
 
   // Détermine si on dessine les tx, les fees ou la récompense
   if (isset($parametres['type']))             $type    = $parametres['type'];

methode2/circles/draw.php

@@ -14,6 +14,7 @@ function DrawBlock($the_block, $vImage, $parametres)
   $marge_x     = 10;
   $marge_y     = 10;
   $facteur_max = 2.5;
+  $alpha       = 0; 
 
   // Détermine si on dessine les tx, les fees ou la récompense
   if (isset($parametres['type']))             $type    = $parametres['type'];

methode2/spirale/draw.php

@@ -0,0 +1,135 @@
+<?php
+
+function DrawBlock($the_block, $vImage, $parametres)
+{
+  // valeurs par défaut
+  $type   = 1;
+
+  // Ces variables vont permettre de caler les lignes
+  // dans la zone de dessin en se laissant des marges
+  // en haut et en bas
+  $somme       = 0;
+  $min         =-1;
+  $max         = 0;
+  $marge_x     = 10;
+  $marge_y     = 10;
+  $facteur_max = 2.5;
+  $alpha       = 0; 
+
+  // Détermine si on dessine les tx, les fees ou la récompense
+  if (isset($parametres['type']))             $type    = $parametres['type'];
+
+  // Paramètres de dessin
+  if (isset($parametres['x']))                $x        = $parametres['x'];
+  if (isset($parametres['y']))                $y        = $parametres['y'];
+  if (isset($parametres['width']))            $width    = $parametres['width'];
+  if (isset($parametres['height']))           $height   = $parametres['height'];
+  if (isset($parametres['font_color']))       $vFgColor = $parametres['font_color'];
+  if (isset($parametres['background_color'])) $vBgColor = $parametres['background_color'];
+  if (isset($parametres['font_RGB']))         $vFgRGB   = $parametres['font_RGB'];
+  if (isset($parametres['background_RGB']))   $vBgRGB   = $parametres['background_RGB'];
+
+  // Je reprends les couleurs de Tyler Hobbs
+  $couleursRGB=[
+    [234,220,207],
+    [197,46,39],
+    [183,230,214],
+    [248,200,40],
+    [51,41,32],
+    [250,142,41],
+    [5,37,32],
+    [233,201,58],
+    [183,230,214]
+  ];
+  $couleurs = [];
+  $nb_couleurs = count($couleursRGB);
+  for($i=0;$i<$nb_couleurs;$i++) 
+    $couleurs[$i] = imagecolorallocate($vImage,$couleursRGB[$i][0],$couleursRGB[$i][1],$couleursRGB[$i][2]);
+
+  // Prendre une des couleurs au hasard comme couleur de fond
+  shuffle($couleurs);
+  $fond = $couleurs[0];
+  shuffle($couleurs);
+
+  // Remplir le fond
+  imagefilledrectangle($vImage, $x+($marge_x/2), $y+($marge_y/2), $x+$width-+($marge_x/2), $y+$height-+($marge_y/2), $fond);
+
+  // Récup des données
+  $data = blockchain::getTransactionData($the_block, $type);
+  $n_data = count($data);
+
+  // Calcul des min max
+  foreach($data as $v)
+  {
+    if ($v['value'] > $max) $max = $v['value'];
+    if (($v['value'] < $min)||($min == -1)) $min = $v['value'];
+    $somme += $v['value'];
+  }
+  if ($min == $max) $max = $min + 1;
+  if ($somme == 0) return;
+  
+  // On commence au centre de l'image
+  $xc = $x + ($width / 2);
+  $yc = $y + ($height / 2);
+  $r =  $width / 3;
+  $cur = 0;
+  $n = 0;
+  $x1 = $xc;
+  $y1 = $yc;
+  $x2 = $xc;
+  $y2 = $yc;
+
+  // Trouver le max
+  $max=0;
+  while(true){
+    $r1 = 0.05 * $max;
+    $x2 = $xc + $r1*cos($r1);
+    $y2 = $yc + $r1*sin($r1);
+    if (($x2 > $width)  || ($x2 < 0)) break;
+    if (($y2 > $height) || ($y2 < 0)) break;
+    imageline($vImage, $x1, $y1, $x2, $y2, $couleurs[0]);
+    $x1 = $x2;
+    $y1 = $y2;
+    $max++;
+  }
+  $coef = floatval($max) / floatval($somme);
+
+  $cur = 0;
+  $n = 0;
+  $x1 = $xc;
+  $y1 = $yc;
+  $x2 = $xc;
+  $y2 = $yc;
+
+  foreach($data as $transaction)
+  {
+    // chaque fois que toutes les couleurs ont été utilisées
+    //              on mélange leur ordre
+    if (!($n%$nb_couleurs)) shuffle($couleurs);
+    // S'il n'y a qu'une transaction
+    // Ou Si la transaction courante représente plus du 5eme de la somme des tx
+    // On s'interdit la couleur de fond
+    if (($n_data == 1)||($transaction['value'] > ($somme/5)))
+      while ($couleurs[$n%$nb_couleurs] == $fond) $n++;
+    $couleur = $couleurs[$n%$nb_couleurs];
+
+    // le segment de couleur est de longueur proportionnelle
+    // à la valeur de sa transaction
+    $next = $cur + ($coef*$transaction['value']);
+    if ($next > $max) $next = $max;
+
+    while($cur<$next)
+    {
+      $r1 = 0.05 * $cur;
+      $x2 = $xc + $r1*cos($r1);
+      $y2 = $yc + $r1*sin($r1);
+      imageline($vImage, $x1, $y1, $x2, $y2, $couleur);
+      $x1 = $x2;
+      $y1 = $y2;
+      $cur++;
+    }
+    $n++;
+  }
+}
+
+?>

methode2/splinelineblack/draw.php

@@ -28,14 +28,50 @@ function DrawBlock($the_block, $vImage, $parametres)
   if (isset($parametres['font_RGB']))         $vFgRGB   = $parametres['font_RGB'];
   if (isset($parametres['background_RGB']))   $vBgRGB   = $parametres['background_RGB'];
 
-  // Une chance sur deux d'inverser entre fg et bg
+  // Forcer les couleurs
+  $hasard = rand(0,10);
+  $couleur=3;$val=0;
+  if ($hasard > $val++) $couleur = 5;
+  if ($hasard > $val++) $couleur = 6;
+  if ($hasard > $val++) $couleur = 7;
+  if ($hasard > $val++) $couleur = 8;
+
+  $couleur = 8;
+  switch($couleur) {
+    case 3:
+    case 5:
       $fondRGB=[0,0,0];
-  $fond=imagecolorallocate($vImage,$fondRGB[0],$fondRGB[1],$fondRGB[2]);
       $couleurRGB=[240,147,43];
-  $couleur=imagecolorallocate($vImage,$couleurRGB[0],$couleurRGB[1],$couleurRGB[2]);
+      break;
+
+    case 7:
+      $fondRGB=[17,61,86];
+      $couleurRGB=[255,134,63];
+      break;
+
+    case 8:
+      $fondRGB=[234,220,207];
+      $couleurRGB=[252,196,37];
+      break;
+
+    default:
+      $fondRGB=[17,61,86];
+      $couleurRGB=[73,20,26];
+  }
+
+  $img_w = $width;
+  $img_h = $height+(2*$y);
+
+  // Redessiner entête et pied de page
+  $p2 = blockchain::DrawBlockHeaderFooter($the_block, $vImage, $y, $couleur);
+
+  $fond=imagecolorallocate($vImage,$fondRGB[0],$fondRGB[1],$fondRGB[2]);
+  //$couleur=imagecolorallocate($vImage,$couleurRGB[0],$couleurRGB[1],$couleurRGB[2]);
 
   // Remplir le fond
-  imagefilledrectangle($vImage, $x+($marge_x/2), $y+($marge_y/2), $x+$width-+($marge_x/2), $y+$height-+($marge_y/2), $fond);
+  imagefilledrectangle($vImage, 0, $y, $width, $y + $height, $fond);
+  imageline($vImage, 0, 5, 0, $img_h-25, $p2[2]);
+  imageline($vImage, $width-1, 5, $width-1, $img_h-25, $p2[2]);
 
   $vColor    = array();
   // Dégradé de 192 couleurs entre la couleur de dessin et le blanc
@@ -62,6 +98,13 @@ function DrawBlock($the_block, $vImage, $parametres)
   for($i=0;$i<$nb_colors;$i++)
   {
     $rgbval = ColorGradient::hex2rgb($gradient[$i]);
+    // Pas de blanc <=> c'est la transparence ...
+    if (($rgbval[0] == $rgbval[1])&&($rgbval[1] == $rgbval[2])&&($rgbval[0] == 254))
+    {
+      $rgbval[0] = 255;
+      $rgbval[1] = 255;
+      $rgbval[2] = 255;
+    }
     $vColor[192+$i] = new ColorGradient();
     $vColor[192+$i]->pct   = ((192+$i)*1.0) / 256;
     $vColor[192+$i]->color = imagecolorallocate($vImage, $rgbval[0], $rgbval[1], $rgbval[2]);

methode2/tylerhobbs/draw.php

@@ -0,0 +1,216 @@
+<?php
+
+function DrawBlock($the_block, $vImage, $parametres)
+{
+  // valeurs par défaut
+  $type   = 1;
+
+  // Ces variables vont permettre de caler les lignes
+  // dans la zone de dessin en se laissant des marges
+  // en haut et en bas
+  $somme   = 0;
+  $min     =-1;
+  $max     = 0;
+  $marge_x = 10;
+  $marge_y = 10;
+  $facteur_max = 2.5;
+
+  // Détermine si on dessine les tx, les fees ou la récompense
+  if (isset($parametres['type']))             $type    = $parametres['type'];
+
+  // Paramètres de dessin
+  if (isset($parametres['x']))                $x        = $parametres['x'];
+  if (isset($parametres['y']))                $y        = $parametres['y'];
+  if (isset($parametres['width']))            $width    = $parametres['width'];
+  if (isset($parametres['height']))           $height   = $parametres['height'];
+  if (isset($parametres['font_color']))       $vFgColor = $parametres['font_color'];
+  if (isset($parametres['background_color'])) $vBgColor = $parametres['background_color'];
+  if (isset($parametres['font_RGB']))         $vFgRGB   = $parametres['font_RGB'];
+  if (isset($parametres['background_RGB']))   $vBgRGB   = $parametres['background_RGB'];
+
+  $fondRGB=[234,220,207];
+  $couleursRGB=[
+    [197,46,39],
+    [183,230,214],
+    [248,200,40],
+    [51,41,32],
+    [250,142,41],
+    [5,37,32],
+    [233,201,58],
+    [183,230,214]
+  ];
+
+  shuffle($couleursRGB);
+
+  $pas = $height / (count($couleursRGB)-1);
+
+  $img_w = $width;
+  $img_h = $height+(2*$y);
+
+  // Redessiner entête et pied de page
+  $p2 = blockchain::DrawBlockHeaderFooter($the_block, $vImage, $y, 8);
+  $fond=imagecolorallocate($vImage,$fondRGB[0],$fondRGB[1],$fondRGB[2]);
+
+  // Remplir le fond
+  imagefilledrectangle($vImage, 0, $y, $width, $y + $height, $fond);
+  // Tracer des bords à droite et à gauche
+  imageline($vImage, 0, 5, 0, $img_h-25, $p2[2]);
+  imageline($vImage, $width-1, 5, $width-1, $img_h-25, $p2[2]);
+
+  // Récup des données
+  $data = blockchain::getTransactionData($the_block, $type);
+  $n_data = count($data);
+
+  // Un calculateur de Spline
+  $oCurve = new CubicSplines();
+
+  // Calcul des min max
+  foreach($data as $v)
+  {
+    if ($v['value'] > $max) $max = $v['value'];
+    if (($v['value'] < $min)||($min == -1)) $min = $v['value'];
+    $somme += $v['value'];
+  }
+  if ($min == $max) $max = $min + 1;
+  if ($somme == 0) return;
+
+  // On se prend une plus grosse marge en hauteur
+  $coef     = ($height - (4*$marge_y)) / $somme;
+  $limite_x = $x + ($width - (2*$marge_x));
+  $dx       = round(($width - (2*$marge_x)) / (TX_HASH_LEN+10));
+
+  $h0 = 0;
+  $hauteur = $y + (2*$marge_y);
+  $special_draw = (count($data) == 1);
+  $etage = -1;
+
+  // [ TODO ] L'épaisseur du trait dépend du nombre de transactions
+  $epaisseur = 5;
+
+  foreach($data as $transaction)
+  {
+    //
+    // La nouvelle hauteur : cumule des montants de transaction
+    //
+    $hauteur += $coef * $transaction['value'];
+
+    //
+    // Gestion de la couleur
+    //
+    if ($etage != floor($hauteur/$pas))
+    {
+      $etage = floor($hauteur/$pas);
+
+      $vColor    = array();
+      // Dégradé de 192 couleurs entre la couleur de dessin et le blanc
+      $nb_colors = 192;
+      $hex_val   = array(
+        ColorGradient::rgb2hex($couleursRGB[$etage]),
+        ColorGradient::rgb2hex([255,255,255])
+      );
+      $gradient = ColorGradient::gradient($hex_val[0], $hex_val[1], $nb_colors);
+      for($i=0;$i<$nb_colors;$i++)
+      {
+        $rgbval = ColorGradient::hex2rgb($gradient[$i]);
+        // Pas de blanc <=> c'est la transparence ...
+        if (($rgbval[0] == $rgbval[1])&&($rgbval[1] == $rgbval[2])&&($rgbval[0] > 252))
+        {
+          $rgbval[0] = 255;
+          $rgbval[1] = 255;
+          $rgbval[2] = 255;
+        }
+        $vColor[$i] = new ColorGradient();
+        $vColor[$i]->pct   = ($i*1.0) / 256;
+        $vColor[$i]->color = imagecolorallocate($vImage, $rgbval[0], $rgbval[1], $rgbval[2]);
+      }
+      // On ajoute un dégradé de 64 couleurs entre le blanc et la couleur de fond
+      $nb_colors = 64;
+      $hex_val   = array(
+        ColorGradient::rgb2hex([255,255,255]),
+        ColorGradient::rgb2hex($fondRGB)
+      );
+      $gradient = ColorGradient::gradient($hex_val[0], $hex_val[1], $nb_colors);
+      for($i=0;$i<$nb_colors;$i++)
+      {
+        $rgbval = ColorGradient::hex2rgb($gradient[$i]);
+        // Pas de blanc <=> c'est la transparence ...
+        if (($rgbval[0] == $rgbval[1])&&($rgbval[1] == $rgbval[2])&&($rgbval[0] > 252))
+        {
+          $rgbval[0] = 255;
+          $rgbval[1] = 255;
+          $rgbval[2] = 255;
+        }
+        $vColor[192+$i] = new ColorGradient();
+        $vColor[192+$i]->pct   = ((192+$i)*1.0) / 256;
+        $vColor[192+$i]->color = imagecolorallocate($vImage, $rgbval[0], $rgbval[1], $rgbval[2]);
+      }
+      $nb_colors = 256;    
+    }
+
+    //
+    // Cas des blocks qui n'ont qu'une seule transaction
+    //             On se cale au milieu
+    // 
+    if ($special_draw) $hauteur = $y + ($height / 2);
+
+    //
+    // Ne pas tracer 2 lignes à la même hauteur
+    //   => c'est possible du fait de l'arrondi
+    //      si la transaction a un montant faible
+    //
+    if ((floor($hauteur)-$h0)<2) continue;
+    $h0 = floor($hauteur);
+
+    $x0 = $x + $marge_x;
+
+    //
+    // On découpe la ligne en fonction du nombre de DIGIT 
+    //         dans le hash des transactions
+    //
+    $facteur      = 0.1;
+    $aCoords      = array();
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    $aCoords[$x0] = $h0; $x0 += $dx;
+    for ($i = 0; $i < TX_HASH_LEN; $i++) 
+    {
+      $y0 = $h0;
+      $valeur = hexdec($transaction['hash'][$i]);
+      if ($valeur != 0) $y0 += floor(($valeur - 8) * $facteur);
+      $x0 += $dx;
+      $aCoords[$x0] = $y0;
+
+      if ($y0 == $h0) continue;
+
+      $facteur = 0.1 + (($facteur_max*$i) / TX_HASH_LEN);
+      if ($facteur > $facteur_max) $facteur = $facteur_max;
+    }
+
+    for($i=0;$i<$epaisseur;$i++) 
+    {
+      foreach($aCoords as &$aCoord)
+      {
+        $aCoord += 1;
+        if ($aCoord < $y+$marge_y)           $aCoord = $y+$marge_y;
+        if ($aCoord > ($y+$height-$marge_y)) $aCoord = $y+$height-$marge_y;
+      }
+
+      $oCurve->setInitCoords($aCoords);
+      $r = $oCurve->processCoords();
+      if ($r)
+      {
+        $curveGraph = new Plot($r);
+        $curveGraph->drawLine($vImage, $vColor, $x0, $limite_x);
+      }
+    }
+  }
+}
+
+?>

robot.sh

@@ -8,8 +8,10 @@ export TMP_PATH=$APPS_PATH/../tmp
 export DATA_PATH=$APPS_PATH/../data
 export FLAG_PATH=$APPS_PATH/../flags
 
+export TS=`date +%s`
 export MINUTE=`date +%M | sed 's/^0*//'`
 export DATE=`date +%Y%m%d0000`
+export DATEHOUR=`date +%Y%m%d%H`
 
 #
 # Synchronize the Blockchain

scripts/blocks2.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-lescript=`basename $0 .sh`
+lescript=blocks2
 
 #
 #  TOOLS
@@ -39,6 +39,8 @@ then
 fi
 
 while IFS='' read -r line || [[ -n "$line" ]]; do
+
+  NAME=`echo $line | awk '{print $1}'`
   BLOCK=`echo $line | awk '{print $2}'`
   HEIGHT=`echo $line | awk '{print $3}'`
   NBTX=`echo $line | awk '{print $4}'`
@@ -57,26 +59,38 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
   #
   # CHOISIR UNE METHODE2 AU HASARD
   #
-  for METHODE in `ls $APPS_PATH/methode2 | grep -v robot | shuf`
+  # LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf`
+  # LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf | head -n 1`
+  # en rajoutant le head, on ne fait qu'un seul dessin 
+  LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf | head -n 1`
+  if [ $HEIGHT -eq 1 ]
+  then
+    LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v treemap | grep -v robot | shuf | head -n 1`
+  fi
+
+  cd $APPS_PATH/methode2
+  for METHODE in $LISTE_METHODE
   do
-    echo $METHODE
     if [ ! -d $DATA_PATH/$METHODE ]
     then
       mkdir -p $DATA_PATH/$METHODE
     fi
-
+    echo $BLOCK $NAME $METHODE
     if [ ! -f $DATA_PATH/$METHODE/$BLOCK.png ]
     then
-      cd $APPS_PATH/methode2
       php robot.php $METHODE $BLOCK $((RANDOM % 6)) $2
-      if [ "$2" == "" ]; 
+      cp $DATA_PATH/last/$BLOCK.png $DATA_PATH/$METHODE/$BLOCK.png
-      then
-        rm -f $DATA_PATH/hasard/$BLOCK.png
-        ln $DATA_PATH/last/$BLOCK.png $DATA_PATH/$METHODE/$BLOCK.png
-        ln $DATA_PATH/last/$BLOCK.png $DATA_PATH/hasard/$BLOCK.png
-      fi
     fi
   done
+  cd - >> /dev/null
+
+  if [ ! -f $DATA_PATH/hasard/$BLOCK.png ]
+  then
+    cp $DATA_PATH/last/$BLOCK.png $DATA_PATH/hasard/$BLOCK.png
+  fi
+
+  rm -f $flag
+
 done < $DATA_PATH/block_list.txt
 
 #

scripts/clean_data.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# Antidater les données des blocks connus
+date=`date +%Y%m%d0000`
+touch -t $date $DATA_PATH/emptybot/*
+for BLOCK in `grep -v LAST  $DATA_PATH/block_list.txt | grep -v CACHE | awk '{print $2}'`
+do
+  touch -t $date $DATA_PATH/*/$BLOCK.*
+done
+
+# Effacer ce qui trop vieux
 if [ "$#" -eq  "0" ]
 then
   if [ -d $DATA_PATH ]

scripts/tweet.sh

@@ -53,11 +53,28 @@ then
   echec
 fi
 
+if [ ! -d $DATA_PATH/twitterbot ]
+then
+  mkdir -p $DATA_PATH/twitterbot
+fi
+
+if [ ! -d $DATA_PATH/emptybot ]
+then
+  mkdir -p $DATA_PATH/emptybot
+fi
+
 #
 # TWEET
 #
-TWEET=30
+
-if [ $((MINUTE % $TWEET)) -eq 0 ]
+# tweet Topisto : empty blocks
+$APPS_PATH/twitter/emptybot/robot.sh 2>&1
+
+# tweet frequency : 2 Hours
+#TWEETFREQ=7200
+#if [ $((TS % $TWEETFREQ)) -eq 0 ]
+# Tweet freq : One per Hour
+if [ ! -f $DATA_PATH/twitterbot/$DATEHOUR ]
 then
   debug "send a TWEET"
 
@@ -66,8 +83,10 @@ then
 
   # "auto likes" from Topisto
   $APPS_PATH/twitter/likebot/robot.sh 2>&1
+
+  touch $DATA_PATH/twitterbot/$DATEHOUR
 else
-  debug "no TWEET"
+  debug "skip TWEET"
 fi
 
 #

twitter/emptybot/followers.json.example

@@ -0,0 +1 @@
+["topisto42","UnnaxPayments","aureliusdrusus","solacedotcom","omgbtc","ohiobitcoin","LogicScience","redunisproject","Cryptocracy2020","fullstache","callblockapp","marketranger","TheCryptodamus","crypt0co","CryptoassetsUSA","Nadeem_nadi797","cryptomoneyz","BaseCyberSec","Tweetsintoabyss","anthkell98","grattonboy","mac_a_dam","devnullius","123wolfArmy","03018333860","JeffinkoGuru","BitJob_Team","rugigana","Crypto_info321","cointopic_","Chef_JeanPierre","Cienencom","btcltcdigger","AdzCoin_Gift","treyptrsn","n2yolo","SHL0M0ABADD0N","EdwardCulligan","promote_crypto","TheFutureShift","ErickCoval","RIMCorpPK","arhiezvanhoute1","ttoff85","actu_fintech","BeautyBubble","PDX_Trader","Yasirperdesi","cre8hyperledger","Thurse8","cre8capital","icobountyprogs","rob67803423","AphexTwin4ever"]

twitter/emptybot/inc/twitter.php

@@ -0,0 +1,88 @@
+<?php
+
+use Abraham\TwitterOAuth\TwitterOAuth;
+
+// Twitter OAuth Settings:
+/* TOPISTO */
+define('CONSUMER_KEY', 'HBInbm93bM80z86XVJ34rtjxO');
+define('CONSUMER_SECRET', 'zpdSp8yv9R2VODgPRA0RZbiO7VE8vSPNLVNg9zI0HjWnJKADO8');
+define('ACCESS_TOKEN', '315679287-EjINhav5VbJPscb4h9pw3WwveeeX0ShpnIjcawDe');
+define('ACCESS_TOKEN_SECRET', 'SIFKfPYEoIdlAyeQKVS3y067uNFuLpy013wRycJ8VxNcd');
+
+/* R. Topisto 
+define('CONSUMER_KEY', '9Ie6CjwM5eZSQu5Xnbel4PBqm');
+define('CONSUMER_SECRET', 'pI4ha5gW7Lft6Lg5xP7nH49Yqbm8PwLn1EP8D1qKg1q0SYd5t2');
+define('ACCESS_TOKEN', '840479603143630849-c3xFLJFvo77ubP1njoXHpFu9LQqKLR8');
+define('ACCESS_TOKEN_SECRET', 'EW4Zi10cQnNfoOunnEF1svJ3omz223U57G6KuYo5ZZ2Ls');
+*/
+
+define('TWITTER_WIDTH', 880);
+define('TWITTER_HEIGHT', 440);
+
+class twitter
+{
+  public static function tweet($message, $media='')
+  {
+    $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET);
+    $content = $twitter->get('account/verify_credentials');
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    $parameters = array("status" => $message);
+
+    if (($media != NULL)&&($media != ''))
+    {
+      $imageMedia = $twitter->upload('media/upload', array('media' => $media));
+      if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+      $parameters = array(
+        "status" => $message,
+        "media_ids" => $imageMedia->media_id_string);
+    }
+
+    $statuses = $twitter->post("statuses/update", $parameters);
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    return TRUE;
+  }
+
+  public static function thanksRetweet()
+  {
+    $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET);
+    $content = $twitter->get('account/verify_credentials');
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    $results = $twitter->get('statuses/retweets_of_me');
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    /* TO DO */
+
+    return TRUE;
+  }
+
+  public static function thanksFollowers()
+  {
+    $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET);
+    $content = $twitter->get('account/verify_credentials');
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    $results = $twitter->get('followers/list');
+    if ($twitter->getLastHttpCode() !== 200) return FALSE;
+
+    $followers = json_decode(file_get_contents('followers.json'));
+    foreach($results->users as $user)
+      if (!in_array($user->screen_name, $followers))
+      {
+        $parameters = array("status" => '@'.$user->screen_name.' thanks following me !');
+        $followers[] = $user->screen_name;
+        $statuses = $twitter->post("statuses/update", $parameters);
+        if ($twitter->getLastHttpCode() !== 200) return FALSE;
+        break; // Un à la fois ...
+      }
+    file_put_contents('followers.json', json_encode($followers));
+
+    return TRUE;
+  }
+
+}
+
+?>

twitter/emptybot/robot.php

@@ -0,0 +1,82 @@
+<?php
+
+// ---
+// --- Listening to blockchain.info to get the last block
+// --- Drawing the block as a Treemap
+// --- Tweet it
+// ---
+
+// ---
+// --- La config globale
+// ---
+require_once '../../global/inc/config.php';
+
+// ---
+// --- External dependances
+// ---
+require TOPISTO_PATH.'/ressources/vendor/autoload.php';
+
+// ---
+// --- Internal dependances
+// ---
+require_once APP_PATH.'/blockchain/inc/block.php';
+require 'inc/twitter.php';
+
+$midnight = strtotime('today midnight');
+
+$methode='spline';
+if (isset($argv[3])) $methode=$argv[3];
+
+$block_hash = $argv[1];
+$the_block = blockchain::getBlockWithHash($block_hash);
+if ($the_block === FALSE) die();
+
+// ---
+// --- Remercier les followers ?
+// ---
+// twitter::thanksFollowers();
+
+$image_file=DATA_PATH."/$methode/".$argv[1].'.png';
+
+if (file_exists($image_file))
+{
+  $image_origine = imagecreatefrompng($image_file);
+  $image_twitter = imagecreatetruecolor(TWITTER_WIDTH, TWITTER_HEIGHT);
+
+  $fond = imagecolorallocate($image_twitter, 255, 255, 255);
+  //imagecolortransparent($image_twitter, $fond);
+  imagefilledrectangle($image_twitter, 0, 0, TWITTER_WIDTH, TWITTER_HEIGHT, $fond);
+
+  $ratio = TWITTER_HEIGHT / imagesy($image_origine); 
+  $new_width = $ratio * imagesx($image_origine);
+
+  $xpos = floor((TWITTER_WIDTH - $new_width) / 2);
+  $ypos = 0;
+
+  imagecopyresized($image_twitter, $image_origine, $xpos, $ypos, 0, 0, $new_width, TWITTER_HEIGHT, imagesx($image_origine), imagesy($image_origine));
+
+  $image_file = DATA_PATH."/emptybot/".$argv[1].'.png';
+
+  imagepng($image_twitter,$image_file);
+
+  // ---
+  // --- Un petit peu de stéganographie ...
+  // ---
+/* Ca fait des fichiers trop gros !
+  $processor = new KzykHys\Steganography\Processor();
+  $image = $processor->encode($image_file, 'TOPISTO is making art with block '.$the_block->height);
+  $image->write($image_file);
+*/
+
+  // ---
+  // --- Tweet
+  // ---
+  $tweet  = "Lucky One on #bitcoin #blockchain 's".PHP_EOL;
+  $tweet .= "Someone put an empty block ...".PHP_EOL;
+  $tweet .= "And get the reward for it !".PHP_EOL;
+  $tweet .= "Block height : ".$the_block->height.PHP_EOL;
+  $tweet .= "[ See more on www.topisto.net ]";
+  $success = twitter::tweet($tweet, $image_file);
+}
+
+?>

twitter/emptybot/robot.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+flag=$TMP_PATH/emptybot_bot.flag
+
+if [ -f $flag ];
+then
+  echo "empty_bot is already running !"
+  exit 0
+fi
+
+touch $flag
+
+cd $APPS_PATH/twitter/emptybot
+
+#
+# Se lancer pour un tweet sur un block unique
+#
+BLOCK_LINE=`grep LAST $DATA_PATH/block_list.txt`
+BLOCK_HASH=`echo ${BLOCK_LINE} | awk '{print $2}'`
+BLOCK_NAME=`echo ${BLOCK_LINE} | awk '{print $1}'`
+BLOCK_HEIGHT=`echo ${BLOCK_LINE} | awk '{print $3}'`
+BLOCK_SIZE=`echo ${BLOCK_LINE} | awk '{print $4}'`
+
+if [ $BLOCK_SIZE -eq 1 ]
+then
+  if [ -f $DATA_PATH/hasard/$BLOCK_HASH.png ]
+  then
+    if [ ! -f $DATA_PATH/emptybot/$BLOCK_HASH.png ]
+    then
+      echo Tweet EmptyBlock for $BLOCK_HASH
+      echo $BLOCK_LINE >> $DATA_PATH/emptybot/list.txt
+      php robot.php $BLOCK_HASH $BLOCK_NAME hasard $BLOCK_HEIGHT
+      # Don't TWEET it again ...
+      touch $DATA_PATH/twitterbot/$BLOCK_HASH
+    fi
+  fi
+fi
+
+rm -f $flag

twitter/twitterbot/followers.json

@@ -0,0 +1 @@
+["CryptoPressNews","ryushi_w","JoelPlatoon"]

twitter/twitterbot/robot.php

@@ -69,7 +69,7 @@ if (file_exists($image_file))
   // ---
   // --- Tweet
   // ---
-  $tweet  = "#bitcoin #blockchain 's".PHP_EOL;
+  $tweet  = "#computerart :".PHP_EOL."#bitcoin #blockchain 's".PHP_EOL;
   $tweet .= $argv[2]." Block, Height : ".$the_block->height.PHP_EOL;
   $tweet .= "[ See more on www.topisto.net ]";
   $success = twitter::tweet($tweet, $image_file);

twitter/twitterbot/robot.sh

@@ -14,18 +14,17 @@ cd $APPS_PATH/twitter/twitterbot
 #
 # Tweet pour un assemblage de hash
 #
-for fichier in `ls $DATA_PATH/hashes2hashes/*.png`
+for fichier in `ls -tr $DATA_PATH/hashes2hashes/*.png`
 do
-  BLOCK=`basename $fichier .png`
+  BLOCK_HASH=`basename $fichier .png`
-  if [ ! -f $DATA_PATH/twitterbot/assemblage_$BLOCK ]
-  then
-    php robot.php $BLOCK CONFIRMED hashes2hashes
-    touch $DATA_PATH/twitterbot/assemblage_$BLOCK
-    rm -f $flag
-    exit 0
-  fi
 done
 
+if [ 5 -gt $((RANDOM % 100)) ]
+then
+  php robot.php $BLOCK_HASH CONFIRMED hashes2hashes
+  touch $DATA_PATH/twitterbot/$BLOCK_HASH
+fi
+
 #
 # Se lancer pour un tweet sur un block unique
 #