From d15dabb4b50655e852ff74e54922849e2fdc4a8c Mon Sep 17 00:00:00 2001 From: nolash Date: Thu, 29 Apr 2021 08:37:41 +0200 Subject: [PATCH] Move solidity source to subfolder --- Makefile | 9 ++-- calculate_eip165.py | 4 +- reduce_to_methods.py | 2 +- scripts/registry_list.py | 44 ------------------- .../AccountsIndex.sol | 0 Declarator.sol => solidity/Declarator.sol | 0 Faucet.sol => solidity/Faucet.sol | 0 Registry.sol => solidity/Registry.sol | 0 to_interface.sh | 4 +- util/calculate_erc165.py | 17 ------- 10 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 scripts/registry_list.py rename AccountsIndex.sol => solidity/AccountsIndex.sol (100%) rename Declarator.sol => solidity/Declarator.sol (100%) rename Faucet.sol => solidity/Faucet.sol (100%) rename Registry.sol => solidity/Registry.sol (100%) delete mode 100644 util/calculate_erc165.py diff --git a/Makefile b/Makefile index b806596..5a3db6a 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later # File-version: 5 -INPUTS = $(wildcard *.sol) +INPUTS = $(wildcard solidity/*.sol) OUTPUTS_JSON = $(patsubst %.sol, %.json, $(INPUTS)) OUTPUTS_INTERFACE = $(patsubst %.sol, %.interface, $(INPUTS)) -OUTPUTS = ${OUTPUTS_JSON} ${OUTPUTS_INTERFACE} +OUTPUTS = $(OUTPUTS_JSON) $(OUTPUTS_INTERFACE) PREFIX = /usr/local/share/cic/solidity/abi #%.abi.json: $(wildcard *.sol) @@ -20,12 +20,13 @@ PREFIX = /usr/local/share/cic/solidity/abi bash to_interface.sh $(basename $@).sol > $@ all: $(OUTPUTS) + echo $(OUTPUTS) install: $(OUTPUTS) install -vDm0644 -t $(PREFIX) $? clean: - rm -vf *.json - rm -vf *.interface + rm -vf solidity/*.json + rm -vf solidity/*.interface .PHONY: clean install diff --git a/calculate_eip165.py b/calculate_eip165.py index 97e8d52..59a0557 100644 --- a/calculate_eip165.py +++ b/calculate_eip165.py @@ -5,8 +5,8 @@ import sys # external imports import sha3 -#logging.basicConfig(level=logging.WARNING) -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level=logging.WARNING) +#logging.basicConfig(level=logging.DEBUG) logg = logging.getLogger() if __name__ == '__main__': diff --git a/reduce_to_methods.py b/reduce_to_methods.py index 9dfc426..da8c7f6 100644 --- a/reduce_to_methods.py +++ b/reduce_to_methods.py @@ -3,7 +3,7 @@ import logging import ply.lex as lex -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() diff --git a/scripts/registry_list.py b/scripts/registry_list.py deleted file mode 100644 index 8e32aaa..0000000 --- a/scripts/registry_list.py +++ /dev/null @@ -1,44 +0,0 @@ -import sys - -from chainlib.eth.constant import ZERO_ADDRESS -from chainlib.eth.gas import DefaultGasOracle -from chainlib.eth.nonce import DefaultNonceOracle -from chainlib.eth.tx import TxFactory -from chainlib.eth.connection import HTTPConnection -from chainlib.eth.hash import keccak256_string_to_hex -from chainlib.eth.rpc import jsonrpc_template -from chainlib.eth.error import EthException -import eth_abi -from hexathon import ( - strip_0x, - add_0x, - ) - -i = 0 -while True: - conn = HTTPConnection('http://localhost:63545') - gas_oracle = DefaultGasOracle(conn) - nonce_oracle = DefaultNonceOracle(ZERO_ADDRESS, conn) - - # Get Token registry address - txf = TxFactory(signer=None, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=8996) - tx = txf.template(ZERO_ADDRESS, sys.argv[1]) - identifiers_method = keccak256_string_to_hex('identifiers(uint256)')[:8] - data = add_0x(identifiers_method) - data += eth_abi.encode_single('uint256', i).hex() - txf.set_code(tx, data) - - o = jsonrpc_template() - o['method'] = 'eth_call' - tx = txf.normalize(tx) - o['params'].append(tx) - o['params'].append('latest') - try: - r = conn.do(o) - except EthException: - break - id_bytes = bytes.fromhex(strip_0x(r)) - id_str = id_bytes[:id_bytes.find(b'\x00')] - print(id_str.decode('utf-8̈́')) - i += 1 - diff --git a/AccountsIndex.sol b/solidity/AccountsIndex.sol similarity index 100% rename from AccountsIndex.sol rename to solidity/AccountsIndex.sol diff --git a/Declarator.sol b/solidity/Declarator.sol similarity index 100% rename from Declarator.sol rename to solidity/Declarator.sol diff --git a/Faucet.sol b/solidity/Faucet.sol similarity index 100% rename from Faucet.sol rename to solidity/Faucet.sol diff --git a/Registry.sol b/solidity/Registry.sol similarity index 100% rename from Registry.sol rename to solidity/Registry.sol diff --git a/to_interface.sh b/to_interface.sh index 825e468..1f48911 100644 --- a/to_interface.sh +++ b/to_interface.sh @@ -3,7 +3,5 @@ d=`mktemp -d` b=`basename $1` s=${b%%.*} -echo $s python3 reduce_to_methods.py $1 > $d/$b -python3 calculate_eip165.py $d/$b > ${s}.interface ->&2 echo $d/$b +python3 calculate_eip165.py $d/$b diff --git a/util/calculate_erc165.py b/util/calculate_erc165.py deleted file mode 100644 index f93f84d..0000000 --- a/util/calculate_erc165.py +++ /dev/null @@ -1,17 +0,0 @@ -import sys -import web3 - -f = open(sys.argv[1], 'r') -z = b'' -for i in range(32): - z += b'\x00' -while True: - l = f.readline() - if l == '': - break - #print('line {}'.format(l)) - h = web3.Web3.keccak(text=l) - z = bytes([a ^ b for a, b in zip(h, z)]) - #print(h.hex(), z.hex()) -f.close() -print(h[:4].hex())