Fixed s-value vs secp256k1n checking

Author: vub

ethereum/bloom.py

@@ -27,7 +27,7 @@ def bloom(val):
 
 def bloom_insert(bloom, val):
     h = utils.sha3(val)
-#    print 'bloom_insert', bloom_bits(val), repr(val)
+#   print 'bloom_insert', bloom_bits(val), repr(val)
     for i in range(0, BUCKETS_PER_VAL * 2, 2):
         bloom |= 1 << ((safe_ord(h[i + 1]) + (safe_ord(h[i]) << 8)) & 2047)
     return bloom

ethereum/specials.py

@@ -18,8 +18,8 @@ def proc_ecrecover(ext, msg):
     v = msg.data.extract32(32)
     r = msg.data.extract32(64)
     s = msg.data.extract32(96)
-    if r >= bitcoin.N or s >= bitcoin.P or v < 27 or v > 28:
-        return 1, msg.gas - opcodes.GECRECOVER, [0] * 32
+    if r >= bitcoin.N or s >= bitcoin.N or v < 27 or v > 28:
+        return 1, msg.gas - opcodes.GECRECOVER, []
     recovered_addr = bitcoin.ecdsa_raw_recover(h, (v, r, s))
     if recovered_addr in (False, (0, 0)):
         return 1, msg.gas - gas_cost, []

ethereum/transactions.py

@@ -72,8 +72,8 @@ def sender(self):
         if not self._sender:
             # Determine sender
             if self.v:
-                if self.r >= N or self.s >= P or self.v < 27 or self.v > 28 \
-                or self.r == 0 or self.s == 0 or self.s >= secpk1n:
+                if self.r >= N or self.s >= N or self.v < 27 or self.v > 28 \
+                or self.r == 0 or self.s == 0:
                     raise InvalidTransaction("Invalid signature values!")
                 log.debug('recovering sender')
                 rlpdata = rlp.encode(self, UnsignedTransaction)

setup.py

@@ -51,6 +51,6 @@ def run_tests(self):
       install_requires=install_requires,
       tests_require=tests_require,
       entry_points=dict(console_scripts=console_scripts),
-      version='1.0.5',
+      version='1.0.6',
       cmdclass=cmdclass
       )