preparation package

Author: dievardump

.gitignore

@@ -5,4 +5,8 @@ cache
 artifacts
 
 .env*
-!.env.SAMPLE
+!.env.SAMPLE
+
+
+dist/*
+!dist/package.json

contracts/SignedAllowance.sol

@@ -62,14 +62,30 @@ contract SignedAllowance {
         uint256 nonce,
         bytes memory signature
     ) public view returns (bytes32) {
+        return
+            _validateSignature(account, nonce, signature, allowancesSigner());
+    }
+
+    /// @dev It ensures that signer signed a message containing (account, nonce, address(this))
+    ///      and that this message was not already used
+    /// @param account the account the allowance is associated to
+    /// @param nonce the nonce associated to this allowance
+    /// @param signature the signature by the allowance signer wallet
+    /// @param signer the signer
+    /// @return the message to mark as used
+    function _validateSignature(
+        address account,
+        uint256 nonce,
+        bytes memory signature,
+        address signer
+    ) internal view returns (bytes32) {
         bytes32 message = createMessage(account, nonce)
             .toEthSignedMessageHash();
 
-        // verifies that the sha3(account, nonce, address(this)) has been signed by _allowancesSigner
-        require(
-            message.recover(signature) == allowancesSigner(),
-            '!INVALID_SIGNATURE!'
-        );
+        // verifies that the sha3(account, nonce, address(this)) has been signed by signer
+        require(message.recover(signature) == signer, '!INVALID_SIGNATURE!');
+
+        // verifies that the allowances was not already used
         require(usedAllowances[message] == false, '!ALREADY_USED!');
 
         return message;

dist/package.json

@@ -0,0 +1,40 @@
+{
+	"name": "@dievardump-web3/signed-allowances",
+	"description": "Package to import and use the contracts of NiftyForge.io",
+	"version": "0.0.0",
+	"files": [
+		"build/**/*",
+		"contracts/**/*",
+		"deploy/**/*",
+		"deployments/**/*",
+		"!contracts/mocks/**/*"
+	],
+	"scripts": {
+		"prepare": "bash ../scripts/package/prepare.sh",
+		"test": "echo \"No test specified\""
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/dievardump/signed-minting.git"
+	},
+	"keywords": [
+		"solidity",
+		"ethereum",
+		"smart",
+		"contracts",
+		"security",
+		"niftyforge"
+	],
+	"author": "dievardump (Simon Fremaux) <dievardump@gmail.com>",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/dievardump/signed-minting/issues"
+	},
+	"homepage": "https://github.com/dievardump/signed-minting/",
+	"publishConfig": {
+		"access": "public"
+	},
+	"devDependencies": {
+		"@openzeppelin/contracts": "^4.3.2"
+	}
+}

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "genuinehumann-contract",
+  "name": "signed-allowances",
   "version": "0.0.1",
-  "description": "Genuine Human contracts",
+  "description": "SignedAllowances in Solidity (or off-chain Allow list)",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -25,4 +25,4 @@
     "hardhat-tracer": "*",
     "minimist": "^1.2.5"
   }
-}
+}

scripts/package/prepare.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+shopt -s globstar
+
+# cd to the root of the repo
+cd "$(git rev-parse --show-toplevel)"
+
+# clean
+rm -rf dist/contracts
+
+# contracts
+cp -r contracts dist/contracts
+rm -rf dist/contracts/mocks