working

Author: okwme

contracts/v5/Sign.sol renamed to contracts/v5/EDSAMock.sol

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "testnet": "npx ganache-cli-i ",
+    "testnet": "npx ganache-cli -i 1234 -m='result chalk culture device mouse post focus marble nurse fire gun venue'",
     "compile": "yarn compile-old && yarn compile-new",
     "compile-old": "buidler compile --config buidler.config.4.js",
     "compile-new": "buidler compile",
@@ -44,6 +44,7 @@
     "@nomiclabs/buidler-solhint": "^1.0.0-beta.13",
     "@nomiclabs/buidler-truffle4": "^1.0.0-beta.13",
     "@nomiclabs/buidler-web3-legacy": "^1.0.0-beta.13",
-    "@truffle/artifactor": "^4.0.33"
+    "@truffle/artifactor": "^4.0.33",
+    "ethers": "^4.0.37"
   }
 }

package.json

@@ -33,9 +33,13 @@ task("sign", "sign")
         jsHashWithPrefix,
         sig2
     )
-    console.log(result === other, result, other)
+    if (result !== other) {
+        throw new Error(`addresses don't match ${result} != ${other}`)
+    }
 
     result = await this.ecdsa.checkClover(other, sig2, tokenId, moves)
-    console.log({result})
-
+    if (!result) {
+        throw new Error(`result was false with checkClover`)
+    }
+    console.log(`Success!`)
 })

tasks/try-sign.js

@@ -10,6 +10,7 @@ const {
   _
 } = require('../helpers/utils')
 
+var ethers = require('ethers')
 var {
   signMessage,
   toEthSignedMessageHash,
@@ -105,6 +106,13 @@ contract('CloversController.sol', async function(accounts) {
       {type:"address", value: recepient}
     )
 
+    const hashedMsgEthers = ethers.utils.solidityKeccak256([
+      'uint256', 'bytes28[2]', 'uint256', 'bool', 'address'
+    ], [
+      symmetricalTokenId1, symmetricalMoves1, symmetricalSymmetries1, keep1, recepient
+    ])
+
+    assert(hashedMsg1 === hashedMsgEthers, `hashes don't match ${hashedMsg1} != ${hashedMsgEthers}`)
 
     const keep2 = true
     reversi = new Rev()
@@ -135,9 +143,17 @@ contract('CloversController.sol', async function(accounts) {
       assert(contractHashedMsg === hashedMsg1, "Hashed messages didn't match")
     })
     it('recover should work', async () => {
-      signature1 = fixSignature(await web3.eth.sign(hashedMsg1, oracle));
+      const foo = await web3.eth.sign(hashedMsg1, oracle)
+      signature1 = fixSignature(foo);
       const jsHashWithPrefix = toEthSignedMessageHash(hashedMsg1)
 
+      const walletProvider = new ethers.Wallet('0xef09de2f5b5125b78652f07c8365b3dabd657611a2818715d73808d0df786f48')
+      const ethersSig = await walletProvider.signMessage(ethers.utils.arrayify(hashedMsg1))
+      assert(ethersSig === signature1, `signatures don't match ${ethersSig} !== ${signature1}`)
+
+      const ethersjsHashWithPrefix = ethers.utils.hashMessage(ethers.utils.arrayify(hashedMsg1))
+      assert(ethersjsHashWithPrefix === jsHashWithPrefix, `hashes don't match ${ethersjsHashWithPrefix} !== ${jsHashWithPrefix}`)
+
       // Recover the signer address from the generated message and signature.
       let result = await cloversController.recover(
         jsHashWithPrefix,

test/CloversController.test.js

@@ -3222,7 +3222,7 @@ [email protected]:
     uuid "2.0.1"
     xmlhttprequest "1.8.0"
 
-ethers@^4.0.0-beta.1, ethers@^4.0.32:
+ethers@^4.0.0-beta.1, ethers@^4.0.32, ethers@^4.0.37:
   version "4.0.37"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.37.tgz#dfa70d59498663878c5e4a977d14356660ca5b90"
   integrity sha512-B7bDdyQ45A5lPr6k2HOkEKMtYOuqlfy+nNf8glnRvWidkDQnToKw1bv7UyrwlbsIgY2mE03UxTVtouXcT6Vvcw==