smartcontractkit · PP-AR-T · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023
diff --git a/.env.example b/.env.example
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,15 @@ package-lock.json
 
 .DS_Store
 src/.DS_Store
+lib/chainlink-brownie-contracts
+lib/contracts
+lib/openzeppelin-contracts
+lib/openzeppelin-contracts-upgradeable
+lib/openzeppelin-contracts-upgradeable
+lib/openzeppelin-contracts
+lib/contracts
+lib/chainlink-brownie-contracts
+lib/openzeppelin-contracts-upgradeable
+lib/openzeppelin-contracts
+lib/contracts
+lib/chainlink-brownie-contracts
diff --git a/.gitmodules b/.gitmodules
@@ -7,7 +7,15 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/foundry-chainlink-toolkit"]
-	path = lib/foundry-chainlink-toolkit
-	url = https://github.com/smartcontractkit/foundry-chainlink-toolkit
-	branch = feature/integration-automation
+[submodule "lib/contracts"]
+	path = lib/contracts
+	url = https://github.com/iden3/contracts
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/solidity-bytes-utils"]
+	path = lib/solidity-bytes-utils
+	url = https://github.com/GNSPS/solidity-bytes-utils
diff --git a/Makefile b/Makefile
@@ -8,9 +8,14 @@ all: clean remove install update build
 clean  :; forge clean
 
 # Remove modules
-remove :; rm -rf .gitmodules && rm -rf .git/modules/* && rm -rf lib && touch .gitmodules && git add . && git commit -m "modules"
-
-install :; forge install smartcontractkit/chainlink-brownie-contracts && forge install rari-capital/solmate && forge install foundry-rs/forge-std
+remove :;   if exist .gitmodules (del /F /Q .gitmodules)
+			if exist .git\modules\ (for /D %%i in (.git\modules\*) do rmdir /S /Q "%%i")
+			if exist lib (rmdir /S /Q lib)
+			type nul > .gitmodules
+			git add .
+			git commit -m "modules"
+
+install :; forge install smartcontractkit/chainlink-brownie-contracts && forge install rari-capital/solmate && forge install foundry-rs/forge-std && forge install iden3/contracts && forge install OpenZeppelin/openzeppelin-contracts && forge install OpenZeppelin/openzeppelin-contracts-upgradeable && forge install GNSPS/solidity-bytes-utils
 
 # Update Dependencies
 update:; forge update

diff --git a/Makefile.windows b/Makefile.windows
@@ -0,0 +1,46 @@
+-include .env
+
+.PHONY: all test clean deploy-anvil
+
+all: clean remove install update build
+
+# Clean the repo
+clean  :; forge clean
+
+# Remove modules
+remove :;   if exist .gitmodules (del /F /Q .gitmodules)
+			if exist .git\modules\ (for /D %%i in (.git\modules\*) do rmdir /S /Q "%%i")
+			if exist lib (rmdir /S /Q lib)
+			type nul > .gitmodules
+			git add .
+			git commit -m "modules"
+
+install :; forge install smartcontractkit/chainlink-brownie-contracts && forge install rari-capital/solmate && forge install foundry-rs/forge-std
+
+# Update Dependencies
+update:; forge update
+
+build:; forge build
+
+test :; forge test 
+
+snapshot :; forge snapshot
+
+slither :; slither ./src 
+
+format :; prettier --write src/**/*.sol && prettier --write src/*.sol
+
+# solhint should be installed globally
+lint :; solhint src/**/*.sol && solhint src/*.sol
+
+anvil :; anvil -m 'test test test test test test test test test test test junk'
+
+# use the "@" to hide the command from your shell 
+deploy-sepolia :; @forge script script/${contract}.s.sol:Deploy${contract} --rpc-url ${SEPOLIA_RPC_URL}  --private-key ${PRIVATE_KEY} --broadcast --verify --etherscan-api-key ${ETHERSCAN_API_KEY}  -vvvv
+
+# This is the private key of account from the mnemonic from the "make anvil" command
+deploy-anvil :; @forge script script/${contract}.s.sol:Deploy${contract} --rpc-url http://localhost:8545  --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast 
+
+deploy-all :; make deploy-${network} contract=APIConsumer && make deploy-${network} contract=KeepersCounter && make deploy-${network} contract=PriceFeedConsumer && make deploy-${network} contract=VRFConsumerV2
+
+-include ${FCT_PLUGIN_PATH}/makefile-external
diff --git a/src/APIConsumer.sol → SampleContract/APIConsumer.sol b/src/APIConsumer.sol → SampleContract/APIConsumer.sol
diff --git a/src/KeepersCounter.sol → SampleContract/KeepersCounter.sol b/src/KeepersCounter.sol → SampleContract/KeepersCounter.sol
diff --git a/src/PriceFeedConsumer.sol → SampleContract/PriceFeedConsumer.sol b/src/PriceFeedConsumer.sol → SampleContract/PriceFeedConsumer.sol
diff --git a/src/VRFConsumerV2.sol → SampleContract/VRFConsumerV2.sol b/src/VRFConsumerV2.sol → SampleContract/VRFConsumerV2.sol
diff --git a/script/APIConsumer.s.sol → SampleContract/script/APIConsumer.s.sol b/script/APIConsumer.s.sol → SampleContract/script/APIConsumer.s.sol
diff --git a/script/HelperConfig.sol → SampleContract/script/HelperConfig.sol b/script/HelperConfig.sol → SampleContract/script/HelperConfig.sol
diff --git a/script/KeepersCounter.s.sol → SampleContract/script/KeepersCounter.s.sol b/script/KeepersCounter.s.sol → SampleContract/script/KeepersCounter.s.sol
diff --git a/script/PriceFeedConsumer.s.sol → ...leContract/script/PriceFeedConsumer.s.sol b/script/PriceFeedConsumer.s.sol → ...leContract/script/PriceFeedConsumer.s.sol
diff --git a/script/VRFConsumerV2.s.sol → SampleContract/script/VRFConsumerV2.s.sol b/script/VRFConsumerV2.s.sol → SampleContract/script/VRFConsumerV2.s.sol
diff --git a/src/test/APIConsumer.t.sol → SampleContract/test/APIConsumer.t.sol b/src/test/APIConsumer.t.sol → SampleContract/test/APIConsumer.t.sol
diff --git a/src/test/KeepersCounter.t.sol → SampleContract/test/KeepersCounter.t.sol b/src/test/KeepersCounter.t.sol → SampleContract/test/KeepersCounter.t.sol
diff --git a/src/test/PriceFeedConsumer.t.sol → SampleContract/test/PriceFeedConsumer.t.sol b/src/test/PriceFeedConsumer.t.sol → SampleContract/test/PriceFeedConsumer.t.sol
diff --git a/src/test/VRFConsumerV2.t.sol → SampleContract/test/VRFConsumerV2.t.sol b/src/test/VRFConsumerV2.t.sol → SampleContract/test/VRFConsumerV2.t.sol
diff --git a/src/test/mocks/LinkToken.sol → SampleContract/test/mocks/LinkToken.sol b/src/test/mocks/LinkToken.sol → SampleContract/test/mocks/LinkToken.sol
diff --git a/src/test/mocks/MockOracle.sol → SampleContract/test/mocks/MockOracle.sol b/src/test/mocks/MockOracle.sol → SampleContract/test/mocks/MockOracle.sol
diff --git a/src/test/mocks/MockV3Aggregator.sol → ...eContract/test/mocks/MockV3Aggregator.sol b/src/test/mocks/MockV3Aggregator.sol → ...eContract/test/mocks/MockV3Aggregator.sol
diff --git a/src/test/mocks/MockVRFCoordinatorV2.sol → ...tract/test/mocks/MockVRFCoordinatorV2.sol b/src/test/mocks/MockVRFCoordinatorV2.sol → ...tract/test/mocks/MockVRFCoordinatorV2.sol
diff --git a/src/test/utils/Cheats.sol → SampleContract/test/utils/Cheats.sol b/src/test/utils/Cheats.sol → SampleContract/test/utils/Cheats.sol
diff --git a/lib/chainlink-brownie-contracts b/lib/chainlink-brownie-contracts
diff --git a/lib/contracts b/lib/contracts
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/foundry-chainlink-toolkit b/lib/foundry-chainlink-toolkit
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/lib/solidity-bytes-utils b/lib/solidity-bytes-utils
diff --git a/lib/solmate b/lib/solmate
diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,19 @@
-@solmate=lib/solmate/src/
-@std=lib/forge-std/src/
-@clones=lib/clones-with-immutable-args/src/
+@solmate/=lib/solmate/src/
+@std/=lib/forge-std/src/
+@clones/=lib/clones-with-immutable-args/src/
 @chainlink/=lib/chainlink-brownie-contracts/
-forge-std/=lib/forge-std/src/
+@contracts/=lib/contracts/contracts/
+@openzeppelin/=lib/openzeppelin-contracts/
+@openzeppelin-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+@solidity-bytes-utils/=lib/solidity-bytes-utils/contracts/
+forge-std/=lib/forge-std/src/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+chainlink-brownie-contracts/=lib/chainlink-brownie-contracts/contracts/src/v0.6/vendor/@arbitrum/nitro-contracts/src/
+ds-test/=lib/forge-std/lib/ds-test/src/
+erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/
+openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/
+openzeppelin-contracts/=lib/openzeppelin-contracts/
+solmate/=lib/solmate/src/
+
+
diff --git a/src/test/Identity.sol b/src/test/Identity.sol
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.8.0 <0.9.0;
+import {OwnableUpgradeable} from "@openzeppelin-upgradeable/access/OwnableUpgradeable.sol";
+import {IState} from "@contracts/interfaces/IState.sol";
+import {ClaimBuilder} from "@contracts/lib/ClaimBuilder.sol";
+import {IdentityLib} from "@contracts/lib/IdentityLib.sol";
+import {IdentityBase} from "@contracts/lib/IdentityBase.sol";
+
+// /**
+//  * @dev Contract managing onchain identity
+//  */
+contract IdentityExample is IdentityBase, OwnableUpgradeable {
+    using IdentityLib for IdentityLib.Data;
+
+    // This empty reserved space is put in place to allow future versions
+    // of the State contract to inherit from other contracts without a risk of
+    // breaking the storage layout. This is necessary because the parent contracts in the
+    // future may introduce some storage variables, which are placed before the State
+    // contract's storage variables.
+    // (see https://docs.openzeppelin.com/upgrades-plugins/1.x/writing-upgradeable#storage-gaps)
+    // slither-disable-next-line shadowing-state
+    // slither-disable-next-line unused-state
+    uint256[500] private __gap;
+
+    function initialize(address _stateContractAddr) public override initializer {
+        super.initialize(_stateContractAddr);
+        __Ownable_init(_stateContractAddr);
+    }
+
+    function addClaimAndTransit(uint256[8] calldata claim) public onlyOwner {
+        addClaim(claim);
+        transitState();
+    }
+
+    function addClaimHashAndTransit(uint256 hashIndex, uint256 hashValue) public onlyOwner {
+        addClaimHash(hashIndex, hashValue);
+        transitState();
+    }
+
+    function revokeClaimAndTransit(uint64 revocationNonce) public onlyOwner {
+        revokeClaim(revocationNonce);
+        transitState();
+    }
+
+    /**
+     * @dev Add claim
+     * @param claim - claim data
+     */
+    function addClaim(uint256[8] calldata claim) public virtual onlyOwner {
+        identity.addClaim(claim);
+    }
+
+    /**
+     * @dev Add claim hash
+     * @param hashIndex - hash of claim index part
+     * @param hashValue - hash of claim value part
+     */
+    function addClaimHash(uint256 hashIndex, uint256 hashValue) public virtual onlyOwner {
+        identity.addClaimHash(hashIndex, hashValue);
+    }
+
+    /**
+     * @dev Revoke claim using it's revocationNonce
+     * @param revocationNonce - revocation nonce
+     */
+    function revokeClaim(uint64 revocationNonce) public virtual onlyOwner {
+        identity.revokeClaim(revocationNonce);
+    }
+
+    /**
+     * @dev Make state transition
+     */
+    function transitState() public virtual onlyOwner {
+        identity.transitState();
+    }
+
+    /**
+     * @dev Calculate IdentityState
+     * @return IdentityState
+     */
+    function calcIdentityState() public view virtual returns (uint256) {
+        return identity.calcIdentityState();
+    }
+
+    function newClaimData() public pure virtual returns (ClaimBuilder.ClaimData memory) {
+        ClaimBuilder.ClaimData memory claimData;
+        return claimData;
+    }
+
+    /**
+     * @dev Builds claim
+     * @param claimData - claim data
+     * @return binary claim
+     */
+    function buildClaim(
+        ClaimBuilder.ClaimData calldata claimData
+    ) public pure virtual returns (uint256[8] memory) {
+        return ClaimBuilder.build(claimData);
+    }
+}