Merge pull request #945 from wavesplatform/cherry-pick-one-proof-limit

Cherry pick one proof limit
wavesplatform · Mar 28, 2018 · f76d9f3 · f76d9f3
2 parents 067b5cd + a49cd60
commit f76d9f3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/main/scala/scorex/transaction/smart/Verifier.scala b/src/main/scala/scorex/transaction/smart/Verifier.scala
@@ -27,9 +27,12 @@ object Verifier {
     }
 
   def verifyAsEllipticCurveSignature[T <: ProvenTransaction](pt: T): Either[ValidationError, T] =
-    Either.cond(
-      crypto.verify(pt.proofs.proofs(0).arr, pt.bodyBytes(), pt.sender.publicKey),
-      pt,
-      GenericError(s"Script doesn't exist and proof doesn't validate as signature for $pt")
-    )
+    pt.proofs.proofs match {
+      case p :: Nil =>
+        Either.cond(crypto.verify(p.arr, pt.bodyBytes(), pt.sender.publicKey),
+                    pt,
+                    GenericError(s"Script doesn't exist and proof doesn't validate as signature for $pt"))
+      case _ => Left(GenericError("Transactions from non-scripted accounts must have exactly 1 proof"))
+    }
+
 }
diff --git a/src/test/scala/com/wavesplatform/state2/diffs/ScriptsValidationTest.scala b/src/test/scala/com/wavesplatform/state2/diffs/ScriptsValidationTest.scala
@@ -163,4 +163,26 @@ class ScriptsValidationTest extends PropSpec with PropertyChecks with Matchers w
     }
   }
 
+  property("exactly 1 proof required for non-scripted accounts") {
+
+    val s = for {
+      master    <- accountGen
+      recipient <- accountGen
+      amt       <- positiveLongGen
+      fee       <- smallFeeGen
+      ts        <- positiveIntGen
+      genesis = GenesisTransaction.create(master, ENOUGH_AMT, ts).explicitGet()
+      setScript <- selfSignedSetScriptTransactionGenP(master, Script(Typed.TRUE))
+      transfer = ScriptTransferTransaction.selfSigned(1, None, master, recipient, amt, ts, fee, Array.emptyByteArray).explicitGet()
+    } yield (genesis, setScript, transfer)
+
+    forAll(s) {
+      case ((genesis, script, transfer)) =>
+        val transferWithExtraProof = transfer.copy(proofs = Proofs(Seq(ByteStr.empty, ByteStr(Array(1: Byte)))))
+        assertDiffAndState(db, Seq(TestBlock.create(Seq(genesis, script))), TestBlock.create(Seq(transferWithExtraProof)), fs) { case _ => () }
+        assertDiffEi(db, Seq(TestBlock.create(Seq(genesis))), TestBlock.create(Seq(transferWithExtraProof)), fs)(totalDiffEi =>
+          totalDiffEi should produce("must have exactly 1 proof"))
+    }
+  }
+
 }