TransactionBuilder - sequenceNumber is now always a BigInteger

zulucrypto · Sep 22, 2018 · 304fe45 · 304fe45
1 parent a7d25da
commit 304fe45
Showing 1 changed file with 8 additions and 26 deletions.
diff --git a/src/Transaction/TransactionBuilder.php b/src/Transaction/TransactionBuilder.php
@@ -380,20 +380,16 @@ public function toXdr()
     {
         $bytes = '';
 
-        // todo: $sequenceNumber should always be a BigInteger
-        if ($this->sequenceNumber) {
-            $sequenceNumber = $this->sequenceNumber->toString();
-        }
-        else {
-            $sequenceNumber = $this->generateSequenceNumber();
+        if (!$this->sequenceNumber) {
+            $this->sequenceNumber = $this->generateSequenceNumber();
         }
 
         // Account ID (36 bytes)
         $bytes .= $this->accountId->toXdr();
         // Fee (4 bytes)
         $bytes .= XdrEncoder::unsignedInteger($this->getFee());
         // Sequence number (8 bytes)
-        $bytes .= XdrEncoder::unsignedInteger64($sequenceNumber);
+        $bytes .= XdrEncoder::unsignedBigInteger64($this->sequenceNumber);
 
         // Time Bounds are optional
         if ($this->timeBounds->isEmpty()) {
@@ -525,25 +521,7 @@ protected function generateSequenceNumber()
             throw new \ErrorException(sprintf('Account not found: %s', $this->accountId->getAccountIdString()));
         }
 
-        try {
-            return $this->apiClient
-                    ->getAccount($this->accountId->getAccountIdString())
-                    ->getSequence() + 1
-                ;
-        } catch (HorizonException $e) {
-            $e->getTraceAsString();
-
-            print "**************\n" . $e->getTraceAsString() . "\n****************\n";
-
-            throw new \ErrorException(
-                sprintf('Could not get sequence number for %s, does this account exist?', $this->accountId->getAccountIdString()),
-                $e->getCode(),
-                $e->getSeverity(),
-                __FILE__,
-                __LINE__,
-                $e
-            );
-        }
+        return $account->getSequenceAsBigInteger()->add(new BigInteger(1));
     }
 
     protected function ensureApiClient()
@@ -601,6 +579,10 @@ public function getSequenceNumber()
      */
     public function setSequenceNumber($sequenceNumber)
     {
+        if (!is_a($sequenceNumber, 'phpseclib\Math\BigInteger')) {
+            $sequenceNumber = new BigInteger($sequenceNumber);
+        }
+
         $this->sequenceNumber = $sequenceNumber;
 
         return $this;