Update

MikeRow · Jun 9, 2020 · e9b5194 · e9b5194
1 parent 04f2478
commit e9b5194
Show file tree

Hide file tree

Showing 59 changed files with 76 additions and 57 deletions.
diff --git a/autoload.php b/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once __DIR__ . '/src/NanoBlock.php';
+require_once __DIR__ . '/src/NanoCLI.php';
+require_once __DIR__ . '/src/NanoRPC.php';
+require_once __DIR__ . '/src/NanoRPCExt.php';
+require_once __DIR__ . '/src/NanoTool.php';
diff --git a/composer.json b/composer.json
@@ -1,8 +1,33 @@
 {
 	"name" : "mikerow/php4nano",
-	"description" : "PHP libraries and tools for the Nano currency",
 	"type" : "library",
+	"description" : "PHP libraries and tools for the Nano currency",
+	"keywords" : [
+		"nano",
+		"raiblocks",
+		"raiblockscommunity",
+		"node",
+		"crypto",
+		"currency",
+		"coin",
+		"protocol",
+		"RPC",
+		"CLI",
+		"tools",
+		"blocks",
+		"library",
+		"libraries",
+		"class",
+		"classes"
+	],
+	"homepage" : "https://github.com/mikerow/php4nano",
 	"license" : "MIT",
+	"authors" : [{
+			"name" : "Mike Row",
+			"nano" : "nano_1mikerow9bqzyqo4ejra6ugr1srerq1egwmacerquch3dz1wry7mkrz4768m",
+			"role" : "Developer"
+		}
+	],
 	"require" : {
 		"php-64bit" : "^7.0.0",
 		"ext-curl" : "*",
@@ -11,11 +36,11 @@
 		"ext-openssl" : "*"
 	},
 	"suggest" : {
-		"ext-blake2" : "https://github.com/strawbrary/php-blake2"
+		"ext-blake2" : "Install the blake2 extension in order to speed up some functions, https://github.com/strawbrary/php-blake2"
 	},
 	"autoload" : {
 		"psr-4" : {
-			"php4nano\\" : "lib/"
+			"php4nano\\" : "src/"
 		}
 	}
 }
diff --git a/lib3/BIP39/BIP39_en.json → lib/BIP39/BIP39_en.json b/lib3/BIP39/BIP39_en.json → lib/BIP39/BIP39_en.json
diff --git a/lib3/Salt/Blake2b/Blake2b.php → lib/Salt/Blake2b/Blake2b.php b/lib3/Salt/Blake2b/Blake2b.php → lib/Salt/Blake2b/Blake2b.php
diff --git a/lib3/Salt/Chacha20/Chacha20.php → lib/Salt/Chacha20/Chacha20.php b/lib3/Salt/Chacha20/Chacha20.php → lib/Salt/Chacha20/Chacha20.php
diff --git a/...alt/Chacha20Poly1305/Chacha20Poly1305.php → ...alt/Chacha20Poly1305/Chacha20Poly1305.php b/...alt/Chacha20Poly1305/Chacha20Poly1305.php → ...alt/Chacha20Poly1305/Chacha20Poly1305.php
diff --git a/lib3/Salt/Curve25519/Curve25519.php → lib/Salt/Curve25519/Curve25519.php b/lib3/Salt/Curve25519/Curve25519.php → lib/Salt/Curve25519/Curve25519.php
diff --git a/lib3/Salt/Ed25519/Ed25519.php → lib/Salt/Ed25519/Ed25519.php b/lib3/Salt/Ed25519/Ed25519.php → lib/Salt/Ed25519/Ed25519.php
diff --git a/lib3/Salt/Ed25519/base.php → lib/Salt/Ed25519/base.php b/lib3/Salt/Ed25519/base.php → lib/Salt/Ed25519/base.php
diff --git a/lib3/Salt/Ed25519/base2.php → lib/Salt/Ed25519/base2.php b/lib3/Salt/Ed25519/base2.php → lib/Salt/Ed25519/base2.php
diff --git a/lib3/Salt/FieldElement.php → lib/Salt/FieldElement.php b/lib3/Salt/FieldElement.php → lib/Salt/FieldElement.php
diff --git a/lib3/Salt/Poly1305/Poly1305.php → lib/Salt/Poly1305/Poly1305.php b/lib3/Salt/Poly1305/Poly1305.php → lib/Salt/Poly1305/Poly1305.php
diff --git a/lib3/Salt/Salsa20/Salsa20.php → lib/Salt/Salsa20/Salsa20.php b/lib3/Salt/Salsa20/Salsa20.php → lib/Salt/Salsa20/Salsa20.php
diff --git a/lib3/Salt/Salt.php → lib/Salt/Salt.php b/lib3/Salt/Salt.php → lib/Salt/Salt.php
diff --git a/lib3/Salt/SaltException.php → lib/Salt/SaltException.php b/lib3/Salt/SaltException.php → lib/Salt/SaltException.php
diff --git a/lib3/Salt/autoload.php → lib/Salt/autoload.php b/lib3/Salt/autoload.php → lib/Salt/autoload.php
diff --git a/lib3/Salt/example/box.php → lib/Salt/example/box.php b/lib3/Salt/example/box.php → lib/Salt/example/box.php
diff --git a/lib3/Salt/example/box_keypair.php → lib/Salt/example/box_keypair.php b/lib3/Salt/example/box_keypair.php → lib/Salt/example/box_keypair.php
diff --git a/lib3/Salt/example/chacha20.php → lib/Salt/example/chacha20.php b/lib3/Salt/example/chacha20.php → lib/Salt/example/chacha20.php
diff --git a/lib3/Salt/example/chacha20poly1305.php → lib/Salt/example/chacha20poly1305.php b/lib3/Salt/example/chacha20poly1305.php → lib/Salt/example/chacha20poly1305.php
diff --git a/lib3/Salt/example/hash.php → lib/Salt/example/hash.php b/lib3/Salt/example/hash.php → lib/Salt/example/hash.php
diff --git a/lib3/Salt/example/onetimeauth.php → lib/Salt/example/onetimeauth.php b/lib3/Salt/example/onetimeauth.php → lib/Salt/example/onetimeauth.php
diff --git a/lib3/Salt/example/scalarmult.php → lib/Salt/example/scalarmult.php b/lib3/Salt/example/scalarmult.php → lib/Salt/example/scalarmult.php
diff --git a/lib3/Salt/example/secretbox.php → lib/Salt/example/secretbox.php b/lib3/Salt/example/secretbox.php → lib/Salt/example/secretbox.php
diff --git a/lib3/Salt/example/sign.php → lib/Salt/example/sign.php b/lib3/Salt/example/sign.php → lib/Salt/example/sign.php
diff --git a/lib3/Salt/example/sodium_sign.php → lib/Salt/example/sodium_sign.php b/lib3/Salt/example/sodium_sign.php → lib/Salt/example/sodium_sign.php
diff --git a/lib3/Util.php → lib/Util.php b/lib3/Util.php → lib/Util.php
diff --git a/lib/NanoBlock.php → src/NanoBlock.php b/lib/NanoBlock.php → src/NanoBlock.php
@@ -2,10 +2,7 @@
 
 namespace php4nano;
 
-require_once __DIR__ . '/NanoTool.php';
-
 use \Exception as Exception;
-use php4nano\NanoTool as NanoTool;
 
 class NanoBlock
 {

diff --git a/lib/NanoCLI.php → src/NanoCLI.php b/lib/NanoCLI.php → src/NanoCLI.php
diff --git a/lib/NanoRPC.php → src/NanoRPC.php b/lib/NanoRPC.php → src/NanoRPC.php
diff --git a/lib/NanoRPCExt.php → src/NanoRPCExt.php b/lib/NanoRPCExt.php → src/NanoRPCExt.php
@@ -2,9 +2,6 @@
 
 namespace php4nano;
 
-require_once __DIR__ . '/NanoTool.php';
-require_once __DIR__ . '/NanoRPC.php';
-
 use \Exception as Exception;
 
 class NanoRPCExt extends NanoRPC
@@ -76,7 +73,8 @@ public function wallet_sweep(array $args)
         foreach ($wallet_balances['balances'] as $account => $balances) {
             if ($account == $destination) {
                 $return['balances'][$account] = [
-                        'warning' => 'Skipped self send'
+                    'notice' => 'Skipped self send',
+                    'amount' => $balances['balance']
                 ];
                 continue;
             }
@@ -99,7 +97,8 @@ public function wallet_sweep(array $args)
 
             if ($send['block'] == self::EMPTY32) {
                 $return['balances'][$account] = [
-                    'error' => 'Bad send'
+                    'error'  => 'Bad send',
+                    'amount' => $balances['balance']
                 ];
             }
         }
@@ -211,7 +210,8 @@ public function wallet_send(array $args)
         foreach ($selected_accounts as $account => $balance) {
             if ($account == $destination) {
                 $return['balances'][$account] = [
-                        'warning' => 'Skipped self send'
+                    'notice' => 'Skipped self send',
+                    'amount' => $balances['balance']
                 ];
                 continue;
             }
@@ -234,7 +234,8 @@ public function wallet_send(array $args)
 
             if ($send['block'] == self::EMPTY32) {
                 $return['balances'][$account] = [
-                    'error' => 'Bad send'
+                    'error'  => 'Bad send',
+                    'amount' => $balances['balance']
                 ];
             }
         }

diff --git a/lib/NanoTool.php → src/NanoTool.php b/lib/NanoTool.php → src/NanoTool.php
@@ -2,11 +2,10 @@
 
 namespace php4nano;
 
-require_once __DIR__ . '/../lib3/Salt/autoload.php';
-require_once __DIR__ . '/../lib3/Util.php';
+require_once __DIR__ . '/../lib/Salt/autoload.php';
+require_once __DIR__ . '/../lib/Util.php';
 
 use \Exception as Exception;
-use \Util as Util;
 use \Uint as Uint;
 use \SplFixedArray as SplFixedArray;
 use \Blake2b as Blake2b;
@@ -342,7 +341,7 @@ public static function mnem2hex(array $words): string
             throw new Exception("Words array count is not 12 or 24");
         }
 
-        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib3/BIP39/BIP39_en.json'), true);
+        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib/BIP39/BIP39_en.json'), true);
         $mnem_count = count($words);
         $bits = [];
         $hex  = [];
@@ -385,7 +384,7 @@ public static function hex2mnem(string $hex): array
             throw new Exception("Invalid hexadecimal string: $hex");
         }
 
-        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib3/BIP39/BIP39_en.json'), true);
+        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib/BIP39/BIP39_en.json'), true);
         $hex_lenght = strlen($hex);
         $bits     = [];
         $mnemonic = [];
@@ -417,7 +416,7 @@ public static function mnem2mseed(array $words, string $passphrase = ''): string
             throw new Exception("Words array count is less than 1");
         }
 
-        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib3/BIP39/BIP39_en.json'), true);
+        $bip39_words = json_decode(file_get_contents(__DIR__ . '/../lib/BIP39/BIP39_en.json'), true);
 
         foreach ($words as $index => $value) {
             $word = array_search($value, $bip39_words);

diff --git a/test/NanoBlock/change.php b/test/NanoBlock/change.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
-require_once __DIR__ . '/../../lib/NanoBlock.php';
-require_once __DIR__ . '/../../lib/NanoRPCExt.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoBlock/open.php b/test/NanoBlock/open.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
-require_once __DIR__ . '/../../lib/NanoBlock.php';
-require_once __DIR__ . '/../../lib/NanoRPCExt.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoBlock/receive.php b/test/NanoBlock/receive.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
-require_once __DIR__ . '/../../lib/NanoBlock.php';
-require_once __DIR__ . '/../../lib/NanoRPCExt.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoBlock/send.php b/test/NanoBlock/send.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
-require_once __DIR__ . '/../../lib/NanoBlock.php';
-require_once __DIR__ . '/../../lib/NanoRPCExt.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoCLI.php b/test/NanoCLI.php
@@ -1,6 +1,6 @@
 <?php 
 
-require_once __DIR__ . '/../lib/NanoCLI.php';
+require_once __DIR__ . '/../autoload.php';
 
 $nanocli = new php4nano\NanoCLI('/home/nano/nano_node');
 

diff --git a/test/NanoRPC.php b/test/NanoRPC.php
@@ -1,6 +1,6 @@
 <?php 
 
-require_once __DIR__ . '/../lib/NanoRPC.php';
+require_once __DIR__ . '/../autoload.php';
 
 $nanorpc = new php4nano\NanoRPC();
 

diff --git a/test/NanoRPCExt.php b/test/NanoRPCExt.php
@@ -1,6 +1,6 @@
 <?php 
 
-require_once __DIR__ . '/../lib/NanoRPCExt.php';
+require_once __DIR__ . '/../autoload.php';
 
 $nanorpc = new php4nano\NanoRPCExt();
 

diff --git a/test/NanoTool/account2public.php b/test/NanoTool/account2public.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 
-echo NanoTool::account2public('nano_3ieu9rjq8uyd3h1taykfb3s14g5p6mnu73hep4iox8w91hew3147eejgogxx');
-
-echo PHP_EOL;
+var_dump(NanoTool::account2public('nano_3ieu9rjq8uyd3h1taykfb3s14g5p6mnu73hep4iox8w91hew3147eejgogxx'));
 
 var_dump(NanoTool::account2public('nano_3ieu9rjq8uyd3h1taykfb3s14g5p6mnu73hep4iox8w91hew3147eejgogxx', false));
diff --git a/test/NanoTool/arr2bin.php b/test/NanoTool/arr2bin.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/bin2arr.php b/test/NanoTool/bin2arr.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/den2den.php b/test/NanoTool/den2den.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/den2raw.php b/test/NanoTool/den2raw.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/getBlockId.php b/test/NanoTool/getBlockId.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/getWork.php b/test/NanoTool/getWork.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/hex2mnem.php b/test/NanoTool/hex2mnem.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/keys.php b/test/NanoTool/keys.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/mnem2hex.php b/test/NanoTool/mnem2hex.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/mnem2mseed.php b/test/NanoTool/mnem2mseed.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/mseed2keys.php b/test/NanoTool/mseed2keys.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/multDiff.php b/test/NanoTool/multDiff.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/private2public.php b/test/NanoTool/private2public.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/public2account.php b/test/NanoTool/public2account.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/raw2den.php b/test/NanoTool/raw2den.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/seed2keys.php b/test/NanoTool/seed2keys.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/signMsg.php b/test/NanoTool/signMsg.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/validSign.php b/test/NanoTool/validSign.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;
 

diff --git a/test/NanoTool/validWork.php b/test/NanoTool/validWork.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../lib/NanoTool.php';
+require_once __DIR__ . '/../../autoload.php';
 
 use php4nano\NanoTool as NanoTool;