fix: handle signed messages that were created through Desktop Wallet 2.0 (#31)

Author: faustbrian

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.2.5 - 2018-12-07
+
+### Fixed
+- Handle signed messages that were created through Desktop Wallet 2.0
+
 ## 0.2.4 - 2018-11-08
 
 ### Fixed

src/Utils/Message.php

@@ -55,7 +55,14 @@ class Message
      */
     public function __construct(object $message)
     {
-        $this->publicKey = $message->publickey;
+        if (property_exists($message, 'publickey')) {
+            $this->publicKey = $message->publickey;
+        } elseif (property_exists($message, 'publicKey')) {
+            $this->publicKey = $message->publicKey;
+        } else {
+            throw new InvalidArgumentException('The given message did not contain a valid public key.');
+        }
+
         $this->signature = $message->signature;
         $this->message = $message->message;
     }

tests/Utils/MessageTest.php

@@ -27,7 +27,7 @@ class MessageTest extends TestCase
     /** @test */
     public function it_should_sign_a_valid_message()
     {
-        $fixture = $this->getFixture('message');
+        $fixture = $this->getFixture('message-v1');
 
         $message = Message::sign($fixture['data']['message'], $fixture['passphrase']);
 
@@ -39,7 +39,7 @@ public function it_should_sign_a_valid_message()
     /** @test */
     public function it_should_create_a_message_from_an_object()
     {
-        $fixture = json_decode(json_encode($this->getFixture('message')['data']));
+        $fixture = json_decode(json_encode($this->getFixture('message-v1')['data']));
 
         $message = Message::new($fixture);
 
@@ -51,7 +51,7 @@ public function it_should_create_a_message_from_an_object()
     /** @test */
     public function it_should_create_a_message_from_an_array()
     {
-        $fixture = $this->getFixture('message')['data'];
+        $fixture = $this->getFixture('message-v1')['data'];
 
         $message = Message::new($fixture);
 
@@ -63,7 +63,7 @@ public function it_should_create_a_message_from_an_array()
     /** @test */
     public function it_should_create_a_message_from_a_string()
     {
-        $fixture = $this->getFixture('message')['data'];
+        $fixture = $this->getFixture('message-v1')['data'];
 
         $message = Message::new(json_encode($fixture));
 
@@ -89,33 +89,41 @@ public function it_should_sign_a_message()
     }
 
     /** @test */
-    public function it_should_verify_a_message()
+    public function it_should_verify_a_message_from_v1()
     {
-        $message = Message::new($this->getFixture('message')['data']);
+        $message = Message::new($this->getFixture('message-v1')['data']);
+
+        $this->assertTrue($message->verify());
+    }
+
+    /** @test */
+    public function it_should_verify_a_message_from_v2()
+    {
+        $message = Message::new($this->getFixture('message-v2')['data']);
 
         $this->assertTrue($message->verify());
     }
 
     /** @test */
     public function it_should_turn_a_message_into_an_array()
     {
-        $message = Message::new($this->getFixture('message')['data']);
+        $message = Message::new($this->getFixture('message-v1')['data']);
 
         $this->assertInternalType('array', $message->toArray());
     }
 
     /** @test */
     public function it_should_turn_a_message_into_json()
     {
-        $message = Message::new($this->getFixture('message')['data']);
+        $message = Message::new($this->getFixture('message-v1')['data']);
 
         $this->assertInternalType('string', $message->toJSON());
     }
 
     /** @test */
     public function it_should_turn_a_message_into_a_string()
     {
-        $message = Message::new($this->getFixture('message')['data']);
+        $message = Message::new($this->getFixture('message-v1')['data']);
 
         $this->assertInternalType('string', $message->__toString());
     }

tests/fixtures/message.json renamed to tests/fixtures/message-v1.json

@@ -0,0 +1,8 @@
+{
+    "data": {
+        "publicKey": "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192",
+        "signature": "304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8",
+        "message": "Hello World"
+    },
+    "passphrase": "this is a top secret passphrase"
+}