Add test for address index for declarator implementation

solidity/AccountsIndexAddressDeclarator.sol

@@ -0,0 +1,50 @@
+pragma solidity >0.6.11;
+
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+
+contract AdccountsIndexAddressDeclarator {
+
+	address public tokenAddress;
+	bytes32 tokenAddressHash;
+	address public addressDeclaratorAddress;
+	mapping(address => uint256) entryIndex;
+	uint256 count;
+
+	address public owner;
+	address newOwner;
+
+	event AddressAdded(address indexed addedAccount, uint256 indexed accountIndex); // AccountsIndex
+	event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); // EIP173
+
+	constructor(address _tokenAddress, address _addressDeclaratorAddress) public {
+		bytes memory _tokenAddressPadded;
+		owner = msg.sender;
+		addressDeclaratorAddress = _addressDeclaratorAddress;
+		tokenAddress = _tokenAddress;
+		_tokenAddressPadded = abi.encode(tokenAddress);
+		tokenAddressHash = sha256(_tokenAddressPadded);
+		count = 1;
+	}
+
+	function add(address _account) external returns (bool) {
+		bool ok;
+		bytes memory r;
+		uint256 oldEntryIndex;
+
+		(ok, r) = addressDeclaratorAddress.call(abi.encodeWithSignature("addDeclaration(address,bytes32)", _account, tokenAddressHash));
+		require(ok);
+		require(r[31] == 0x01);
+
+		oldEntryIndex = count;
+		entryIndex[_account] = oldEntryIndex;
+		count++;
+
+		emit AddressAdded(_account, oldEntryIndex);
+		return true;
+	}
+
+	function have(address _account) external view returns (bool) {
+		return entryIndex[_account] > 0;
+	}
+}

solidity/AddressDeclarator.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]
+[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"haveDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]

solidity/AddressDeclarator.sol

@@ -5,9 +5,10 @@ pragma solidity >0.6.11;
 contract AddressDeclarator {
 
 	mapping( address => address[] ) declarationIndex;
-	mapping( bytes32 => uint256 ) declarationContentIndex;
+	mapping( bytes32 => uint256 ) declarationContentIndex; // the _latest_ content pointer for the declarator to subject mapping
 	mapping( address => address[] ) declarator;
 	mapping( address => address[] ) declaratorReverse;
+	mapping( bytes32 => bool ) declarationExistIndex;
 	bytes32[][] public contents;
 
 	event DeclarationAdded(address _declarator, address _subject, bytes32 _proof);
@@ -36,6 +37,25 @@ contract AddressDeclarator {
 		return k;
 	}
 
+	function toReference(address _declarator, address _subject, bytes32 _proof) private pure returns ( bytes32[2] memory ) {
+		bytes32 k;
+		bytes32[2] memory ks;
+		bytes memory signMaterial = new bytes(64);
+
+		k = toReference(_declarator, _subject);
+		for (uint256 i = 0; i < 32; i++) {
+			signMaterial[i] = k[i];
+		}
+		for (uint256 i = 0; i < 32; i++) {
+			signMaterial[i+32] = _proof[i];
+		}
+
+		ks[0] = k;
+		ks[1] = sha256(signMaterial);
+
+		return ks;
+	}
+
 	// Implements Declarator
 	function declaratorCount(address _subject) public view returns ( uint256 ) {
 		return declarator[_subject].length;
@@ -48,20 +68,23 @@ contract AddressDeclarator {
 
 	// Implements Declarator
 	function addDeclaration(address _subject, bytes32 _proof) public returns ( bool ) {
-		bytes32 k;
+		bytes32[2] memory ks;
 		bytes32[] memory declarationContents;
 		uint256 idx;
-		k = toReference(msg.sender, _subject);
-		idx = declarationContentIndex[k];
+		ks = toReference(tx.origin, _subject, _proof);
+		idx = declarationContentIndex[ks[0]];
 		if (idx == 0) { // This also works for the constructor :)
-			declarator[_subject].push(msg.sender);
-			contents.push(declarationContents); //= contents[idx],
-			declarationIndex[msg.sender].push(_subject);
+			declarator[_subject].push(tx.origin);
+			contents.push(declarationContents);
+			declarationIndex[tx.origin].push(_subject);
 		}
+
 		idx = contents.length-1;
-		declarationContentIndex[k] = idx;
+		declarationContentIndex[ks[0]] = idx;
 		contents[idx].push(_proof);
 
+		declarationExistIndex[ks[1]] = true;
+
 		return true;
 	}
 
@@ -74,6 +97,15 @@ contract AddressDeclarator {
 		return contents[idx];
 	}
 
+	// Implements Declarator
+	function haveDeclaration(address _declarator, address _subject, bytes32 _proof) public view returns (bool) {
+		bytes32[2] memory ks;
+		
+		ks = toReference(_declarator, _subject, _proof);
+
+		return declarationExistIndex[ks[1]];
+	}
+
 	// Implements Declarator
 	function declarationCount(address _declarator) public view returns ( uint256 ) {
 		return declarationIndex[_declarator].length;
@@ -92,5 +124,6 @@ contract AddressDeclarator {
 		if (_sum == 0x01ffc9a7) { // EIP165
 			return true;
 		}
+		return false;
 	}
 }

solidity/Makefile

@@ -1,19 +1,30 @@
 SOLC = /usr/bin/solc
 
-all:
+all: address_declarator token_index accounts_index
+
+address_declarator:
 	$(SOLC) AddressDeclarator.sol --abi --evm-version byzantium | awk 'NR>3' > AddressDeclarator.json
 	$(SOLC) AddressDeclarator.sol --bin --evm-version byzantium | awk 'NR>3' > AddressDeclarator.bin
 	truncate -s -1 AddressDeclarator.bin
+
+token_index:
 	$(SOLC) TokenUniqueSymbolIndex.sol --abi --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndex.json
 	$(SOLC) TokenUniqueSymbolIndex.sol --bin --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndex.bin
 	truncate -s -1 TokenUniqueSymbolIndex.bin
 
-test: all
+
+accounts_index:
+	$(SOLC) AccountsIndexAddressDeclarator.sol --abi --evm-version byzantium | awk 'NR>3' > AccountsIndexAddressDeclarator.json
+	$(SOLC) AccountsIndexAddressDeclarator.sol --bin --evm-version byzantium | awk 'NR>3' > AccountsIndexAddressDeclarator.bin
+	truncate -s -1 AccountsIndexAddressDeclarator.bin
+
+#test: all
 	#python test.py
-	python test_tokenindex.py
+	#python test_tokenindex.py
 
 install: all
 	cp -v AddressDeclarator.{json,bin} ../python/eth_address_declarator/data/
 	cp -v TokenUniqueSymbolIndex.{json,bin} ../python/eth_token_index/data/
+	cp -v AccountsIndexAddressDeclarator.{json,bin} ../python/eth_address_declarator/data/
 	
 .PHONY: test install