Bump murmurhash/phpunit, fix tests

.scrutinizer.yml

@@ -11,7 +11,7 @@ build:
         redis: false
         postgresql: false
         php:
-           version: 7.2
+           version: 7.3
            ini:
                'zend.assertions': '1'
                'assert.exception': '1'

.travis.yml

@@ -2,15 +2,14 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
-  - 7.2
   - 7.3
+  - 7.4
+  - 8.0
 
 env:
   - PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
 
-dist: trusty
+dist: xenial
 sudo: required
 
 cache:
@@ -19,14 +18,14 @@ cache:
 
 matrix:
   exclude:
-    - php: 7.2
+    - php: 8.0
       env: PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
 
   include:
     # add extra test runs for php7: coverage, codestyle, examples, rpc tests
-    - php: 7.2
+    - php: 8.0
       env: COVERAGE=true CODE_STYLE=true EXAMPLES=true PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
-    - php: 7.0
+    - php: 7.3
       env: RPC_TEST=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
 
 install:

composer.json

@@ -26,7 +26,7 @@
     "php-64bit": ">=7.0",
     "pleonasm/merkle-tree": "1.0.0",
     "composer/semver": "^1.4.0|^3.2.0",
-    "lastguest/murmurhash": "v2.0.0",
+    "lastguest/murmurhash": "^2.0",
     "mdanter/ecc": "^0.5.0",
     "bitwasp/buffertools": "^0.5.0",
     "bitwasp/bech32": "^0.0.1"
@@ -37,7 +37,7 @@
   },
   "require-dev": {
     "ext-json": "*",
-    "phpunit/phpunit": "^5.4.0",
+    "phpunit/phpunit": "^9.0",
     "squizlabs/php_codesniffer": "^2.0.0",
     "nbobtc/bitcoind-php": "v2.0.2",
     "bitwasp/secp256k1-php": "^v0.2.0",

phpunit.xml

@@ -8,11 +8,4 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>src/PaymentProtocol/Protobufs</exclude>
-        </whitelist>
-    </filter>
-
 </phpunit>

src/Bloom/BloomFilter.php

@@ -62,11 +62,11 @@ class BloomFilter extends Serializable
     private $flags;
 
     /**
-     * @param Math $math
+     * @param Math  $math
      * @param array $vFilter
-     * @param int $numHashFuncs
-     * @param int $nTweak
-     * @param int $flags
+     * @param int   $numHashFuncs
+     * @param int   $nTweak
+     * @param int   $flags
      */
     public function __construct(Math $math, array $vFilter, int $numHashFuncs, int $nTweak, int $flags)
     {
@@ -91,11 +91,11 @@ public static function emptyFilter(int $size): array
      * Create the Bloom Filter given the number of elements, a false positive rate,
      * and the flags governing how the filter should be updated.
      *
-     * @param Math $math
-     * @param int $nElements
-     * @param float $nFpRate
-     * @param int $nTweak
-     * @param int $flags
+     * @param  Math  $math
+     * @param  int   $nElements
+     * @param  float $nFpRate
+     * @param  int   $nTweak
+     * @param  int   $flags
      * @return BloomFilter
      */
     public static function create(Math $math, int $nElements, float $nFpRate, int $nTweak, int $flags): BloomFilter
@@ -184,33 +184,15 @@ public function getFlags(): int
     }
 
     /**
-     * @param int $nElements
+     * @param int   $nElements
      * @param float $fpRate
      * @return int
      */
     public static function idealSize(int $nElements, float $fpRate): int
     {
-        return (int) floor(
-            bcdiv(
-                min(
-                    bcmul(
-                        bcmul(
-                            bcdiv(
-                                '-1',
-                                (string) self::LN2SQUARED
-                            ),
-                            (string) $nElements
-                        ),
-                        (string) log($fpRate)
-                    ),
-                    bcmul(
-                        (string) self::MAX_FILTER_SIZE,
-                        '8'
-                    )
-                ),
-                '8'
-            )
-        );
+        $a = (-1/self::LN2SQUARED)*$nElements*log($fpRate);
+        $b = self::MAX_FILTER_SIZE*8;
+        return (int) floor(min($a, $b) / 8);
     }
 
     /**
@@ -220,28 +202,13 @@ public static function idealSize(int $nElements, float $fpRate): int
      */
     public static function idealNumHashFuncs(int $filterSize, int $nElements)
     {
-        return (int) floor(
-            min(
-                bcmul(
-                    bcdiv(
-                        bcmul(
-                            (string) $filterSize,
-                            '8'
-                        ),
-                        (string) $nElements
-                    ),
-                    (string) self::LN2
-                ),
-                bcmul(
-                    (string) self::MAX_FILTER_SIZE,
-                    '8'
-                )
-            )
-        );
+        $a = (($filterSize*8)/$nElements)*self::LN2;
+        $b = self::MAX_FILTER_SIZE * 8;
+        return (int) floor(min($a, $b));
     }
 
     /**
-     * @param int $nHashNum
+     * @param int             $nHashNum
      * @param BufferInterface $data
      * @return string
      */

src/Locktime.php

@@ -12,7 +12,7 @@ class Locktime
      * Maximum block height that can be used in locktime, as beyond
      * this is reserved for timestamp locktimes
      */
-    const BLOCK_MAX = 500000000;
+    const BLOCK_MAX = 500000000-1;
 
     /**
      * Maximum timestamp that can be encoded in locktime
@@ -98,8 +98,8 @@ public function fromBlockHeight(int $blockHeight): int
      */
     public function toBlockHeight(int $lockTime): int
     {
-        if ($lockTime >= self::BLOCK_MAX) {
-            throw new \Exception('This locktime is out of range for a block height');
+        if ($lockTime > self::BLOCK_MAX) {
+            throw new \Exception("This locktime is out of range for a block height");
         }
 
         return $lockTime;

src/Mnemonic/Bip39/Wordlist/JapaneseWordList.php

@@ -42,7 +42,7 @@ public function getIndex(string $word): int
         }
 
         if (!isset($this->wordsFlipped[$word])) {
-            throw new \InvalidArgumentException(__CLASS__ . ' does not contain word ' . $word);
+            throw new \InvalidArgumentException('Wordlist does not contain word ' . $word);
         }
 
         return $this->wordsFlipped[$word];

src/Mnemonic/WordList.php

@@ -14,7 +14,7 @@ public function getWord(int $index): string
     {
         $words = $this->getWords();
         if (!isset($words[$index])) {
-            throw new \InvalidArgumentException(__CLASS__ . " does not contain a word for index [{$index}]");
+            throw new \InvalidArgumentException("Wordlist does not contain a word for index [{$index}]");
         }
 
         return $words[$index];

src/Script/Script.php

@@ -288,10 +288,24 @@ public function isWitness(& $program = null): bool
      */
     public function isP2SH(& $scriptHash): bool
     {
+        //
+//        if (strlen($this->script) == 23) {
+//            var_dump("{$this->script[0]} | ".ord($this->script[0])." ".Opcodes::OP_HASH160);
+//            var_dump(ord($this->script[0]) == Opcodes::OP_HASH160);
+//            var_dump("{$this->script[1]} | ".ord($this->script[1])." 20");
+//            var_dump(ord($this->script[1]) == 20);
+//            var_dump("{$this->script[22]} | ".ord($this->script[22])." ".Opcodes::OP_EQUAL);
+//            var_dump(ord($this->script[22]) == Opcodes::OP_EQUAL);
+//        }
+//        echo "isP2SH?\n";
+//        echo "script: ".bin2hex($this->script).PHP_EOL;
         if (strlen($this->script) === 23
-            && $this->script[0] = Opcodes::OP_HASH160
-            && $this->script[1] = 20
-            && $this->script[22] = Opcodes::OP_EQUAL
+            && ord($this->script[0]) == Opcodes::OP_HASH160
+            && ord($this->script[1]) == 20
+            && ord($this->script[22]) == Opcodes::OP_EQUAL
+//            && $this->script[0] == Opcodes::OP_HASH160
+//            && $this->script[1] == 20
+//            && $this->script[22] == Opcodes::OP_EQUAL
         ) {
             $scriptHash = new Buffer(substr($this->script, 2, 20));
             return true;

src/Transaction/Mutator/AbstractCollectionMutator.php

@@ -7,16 +7,18 @@
 abstract class AbstractCollectionMutator implements \Iterator, \ArrayAccess, \Countable
 {
     /**
-     * @var \SplFixedArray
+     * @var array
      */
-    protected $set;
+    protected $set = [];
+
+    private $position = 0;
 
     /**
      * @return array
      */
     public function all(): array
     {
-        return $this->set->toArray();
+        return $this->set;
     }
 
     /**
@@ -32,56 +34,44 @@ public function isNull(): bool
      */
     public function count(): int
     {
-        return $this->set->count();
+        return count($this->set);
     }
 
-    /**
-     *
-     */
-    public function rewind()
+    public function rewind(): void
     {
-        $this->set->rewind();
+        $this->position = 0;
     }
 
     /**
      * @return mixed
      */
     public function current()
     {
-        return $this->set->current();
+        return $this->set[$this->position];
     }
 
-    /**
-     * @return int
-     */
-    public function key()
+    public function key(): int
     {
-        return $this->set->key();
+        return $this->position;
     }
 
-    /**
-     *
-     */
-    public function next()
+    public function next(): void
     {
-        $this->set->next();
+        ++$this->position;
     }
 
-    /**
-     * @return bool
-     */
-    public function valid()
+    public function valid(): bool
     {
-        return $this->set->valid();
+        return array_key_exists($this->position, $this->set);
     }
 
     /**
      * @param int $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
-        return $this->set->offsetExists($offset);
+        return array_key_exists($offset, $this->set);
     }
 
     /**
@@ -93,7 +83,7 @@ public function offsetUnset($offset)
             throw new \InvalidArgumentException('Offset does not exist');
         }
 
-        $this->set->offsetUnset($offset);
+        $this->set = array_slice($this->set, 0, $offset - 1) + array_slice($this->set, $offset + 1);
     }
 
     /**
@@ -102,10 +92,10 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        if (!$this->set->offsetExists($offset)) {
+        if (!array_key_exists($offset, $this->set)) {
             throw new \OutOfRangeException('Nothing found at this offset');
         }
-        return $this->set->offsetGet($offset);
+        return $this->set[$offset];
     }
 
     /**
@@ -114,6 +104,9 @@ public function offsetGet($offset)
      */
     public function offsetSet($offset, $value)
     {
-        $this->set->offsetSet($offset, $value);
+        if ($offset > count($this->set)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->set[$offset] = $value;
     }
 }