@@ -38,22 +38,20 @@ EXTRAS_BACKUP_DIR=${EXTRAS_DIR}/BACKUP
3838SRC_LIB_DIR=${SRC_DIR} /lib
3939EXTRAS_LIB_DIR=${EXTRAS_BACKUP_DIR} /lib
4040
41- EXTRAS_IDENTITIES_DIR=${EXTRAS_BACKUP_DIR} /identities
41+ SRC_COMMON_DIR=${SRC_DIR} /common
42+ INCLUDE_COMMON_DIR=${INCLUDE_CRYPTO_DIR} /common
4243
43- INCLUDE_CONFIGURATION_DIR =${INCLUDE_CRYPTO_DIR} /configuration
44- SRC_CONFIGURATION_DIR =${SRC_DIR} /configuration
44+ SRC_DEFAULTS_DIR =${SRC_DIR} /defaults
45+ INCLUDE_DEFAULTS_DIR =${INCLUDE_CRYPTO_DIR} /defaults
4546
46- INCLUDE_ENUMS_DIR=${INCLUDE_CRYPTO_DIR} /enums
47- SRC_ENUMS_DIR=${SRC_DIR} /enums
48-
49- INCLUDE_HELPERS_DIR=${INCLUDE_CRYPTO_DIR} /helpers
5047SRC_HELPERS_DIR=${SRC_DIR} /helpers
48+ INCLUDE_HELPERS_DIR=${INCLUDE_CRYPTO_DIR} /helpers
5149
52- INCLUDE_ENCODING_DIR=${INCLUDE_HELPERS_DIR} /encoding
5350SRC_ENCODING_DIR=${SRC_HELPERS_DIR} /encoding
51+ INCLUDE_ENCODING_DIR=${INCLUDE_HELPERS_DIR} /encoding
5452
55- INCLUDE_IDENTITIES_DIR=${INCLUDE_CRYPTO_DIR} /identities
5653SRC_IDENTITIES_DIR=${SRC_DIR} /identities
54+ INCLUDE_IDENTITIES_DIR=${INCLUDE_CRYPTO_DIR} /identities
5755
5856INCLUDE_NETWORKS_DIR=${INCLUDE_CRYPTO_DIR} /networks
5957SRC_NETWORKS_DIR=${SRC_DIR} /networks
@@ -100,16 +98,15 @@ if [[ -d ${INCLUDE_DIR} ]]; then
10098 echo -e " Moving 'arkCrypto.h' to 'src' directory.\n"
10199 mv ${INCLUDE_CRYPTO_DIR} /arkCrypto.h ${SRC_DIR}
102100
103- echo -e " Moving 'configuration' headers.\n"
104- mv ${INCLUDE_CONFIGURATION_DIR} /fee.h ${SRC_CONFIGURATION_DIR}
105- mv ${INCLUDE_CONFIGURATION_DIR} /network.h ${SRC_CONFIGURATION_DIR}
106-
107- echo " Creating 'enums' folder 🗂"
108- mkdir ${SRC_ENUMS_DIR}
101+ echo -e " Moving 'common' headers.\n"
102+ mv ${INCLUDE_COMMON_DIR} /configuration.hpp ${SRC_COMMON_DIR}
103+ mv ${INCLUDE_COMMON_DIR} /fee_policy.hpp ${SRC_COMMON_DIR}
104+ mv ${INCLUDE_COMMON_DIR} /network.hpp ${SRC_COMMON_DIR}
109105
110- echo -e " Moving 'enums' headers.\n"
111- mv ${INCLUDE_ENUMS_DIR} /fees.h ${SRC_ENUMS_DIR}
112- mv ${INCLUDE_ENUMS_DIR} /types.h ${SRC_ENUMS_DIR}
106+ echo -e " Moving 'defaults' headers.\n"
107+ mv ${INCLUDE_DEFAULTS_DIR} /fee_policies.hpp ${SRC_DEFAULTS_DIR}
108+ mv ${INCLUDE_DEFAULTS_DIR} /static_fees.hpp ${SRC_DEFAULTS_DIR}
109+ mv ${INCLUDE_DEFAULTS_DIR} /transaction_types.hpp ${SRC_DEFAULTS_DIR}
113110
114111 echo -e " Moving 'helpers' headers.\n"
115112 mkdir ${SRC_ENCODING_DIR}
@@ -122,24 +119,25 @@ if [[ -d ${INCLUDE_DIR} ]]; then
122119 mv ${INCLUDE_IDENTITIES_DIR} /wif.h ${SRC_IDENTITIES_DIR}
123120
124121 echo -e " Moving 'networks' headers.\n"
125- mv ${INCLUDE_NETWORKS_DIR} /abstractnetwork.h ${SRC_NETWORKS_DIR}
126- mv ${INCLUDE_NETWORKS_DIR} /devnet.h ${SRC_NETWORKS_DIR}
127- mv ${INCLUDE_NETWORKS_DIR} /mainnet.h ${SRC_NETWORKS_DIR}
128- mv ${INCLUDE_NETWORKS_DIR} /testnet.h ${SRC_NETWORKS_DIR}
122+ mv ${INCLUDE_NETWORKS_DIR} /networks.hpp ${SRC_NETWORKS_DIR}
123+ mv ${INCLUDE_NETWORKS_DIR} /devnet.hpp ${SRC_NETWORKS_DIR}
124+ mv ${INCLUDE_NETWORKS_DIR} /mainnet.hpp ${SRC_NETWORKS_DIR}
125+ mv ${INCLUDE_NETWORKS_DIR} /testnet.hpp ${SRC_NETWORKS_DIR}
129126
130127 echo -e " Moving 'transactions' headers.\n"
131128 mv ${INCLUDE_TRANSACTIONS_DIR} /builder.h ${SRC_TRANSACTIONS_DIR}
132129 mv ${INCLUDE_TRANSACTIONS_DIR} /deserializer.h ${SRC_TRANSACTIONS_DIR}
133130 mv ${INCLUDE_TRANSACTIONS_DIR} /serializer.h ${SRC_TRANSACTIONS_DIR}
134131 mv ${INCLUDE_TRANSACTIONS_DIR} /transaction.h ${SRC_TRANSACTIONS_DIR}
135132
136- echo -e " Backing up, moving, and removing relevant modules from the 'lib' directory.\n"
133+ echo -e " Backing up, moving, and removing dependencies from the 'src/lib' directory.\n"
134+ mkdir ${EXTRAS_BACKUP_DIR}
137135 mv ${SRC_LIB_DIR} /ArduinoJson ${EXTRAS_BACKUP_DIR}
136+ mv ${SRC_LIB_DIR} /BIP66 ${EXTRAS_BACKUP_DIR}
138137 mv ${SRC_LIB_DIR} /uECC ${EXTRAS_BACKUP_DIR}
139138 mv ${SRC_LIB_DIR} /bcl ${SRC_DIR}
140139 mv ${SRC_LIB_DIR} /date ${SRC_DIR}
141140 mv ${SRC_LIB_DIR} /rfc6979 ${SRC_DIR}
142- mv ${SRC_LIB_DIR} /stl ${SRC_DIR}
143141
144142 echo -e " Moving Docs to the './extras' directory.\n"
145143 mv ${PROJECT_ROOT} /docs ${EXTRAS_DIR}
161159 echo -e " Creating the 'include' directory tree 🗂\n"
162160 mkdir ${INCLUDE_DIR}
163161 mkdir ${INCLUDE_CRYPTO_DIR}
164- mkdir ${INCLUDE_CONFIGURATION_DIR }
165- mkdir ${INCLUDE_ENUMS_DIR }
162+ mkdir ${INCLUDE_COMMON_DIR }
163+ mkdir ${INCLUDE_DEFAULTS_DIR }
166164 mkdir ${INCLUDE_HELPERS_DIR}
167165 mkdir ${INCLUDE_ENCODING_DIR}
168166 mkdir ${INCLUDE_IDENTITIES_DIR}
@@ -172,13 +170,15 @@ else
172170 echo -e " Moving 'arkCrypto.h' back to the 'include/cpp-crypto/' directory.\n"
173171 mv ${SRC_DIR} /arkCrypto.h ${INCLUDE_CRYPTO_DIR}
174172
175- echo -e " Moving 'configuration' headers.\n"
176- mv ${SRC_CONFIGURATION_DIR} /fee.h ${INCLUDE_CONFIGURATION_DIR}
177- mv ${SRC_CONFIGURATION_DIR} /network.h ${INCLUDE_CONFIGURATION_DIR}
173+ echo -e " Moving 'common' headers.\n"
174+ mv ${SRC_COMMON_DIR} /configuration.hpp ${INCLUDE_COMMON_DIR}
175+ mv ${SRC_COMMON_DIR} /fee_policy.hpp ${INCLUDE_COMMON_DIR}
176+ mv ${SRC_COMMON_DIR} /network.hpp ${INCLUDE_COMMON_DIR}
178177
179- echo -e " Moving 'enums' headers.\n"
180- mv ${SRC_ENUMS_DIR} /fees.h ${INCLUDE_ENUMS_DIR}
181- mv ${SRC_ENUMS_DIR} /types.h ${INCLUDE_ENUMS_DIR}
178+ echo -e " Moving 'defaults' headers.\n"
179+ mv ${SRC_DEFAULTS_DIR} /fee_policies.hpp ${INCLUDE_DEFAULTS_DIR}
180+ mv ${SRC_DEFAULTS_DIR} /static_fees.hpp ${INCLUDE_DEFAULTS_DIR}
181+ mv ${SRC_DEFAULTS_DIR} /transaction_types.hpp ${INCLUDE_DEFAULTS_DIR}
182182
183183 echo -e " Moving 'helpers/encoding' headers.\n"
184184 mv ${SRC_ENCODING_DIR} /hex.h ${INCLUDE_ENCODING_DIR}
@@ -191,10 +191,10 @@ else
191191 mv ${SRC_IDENTITIES_DIR} /wif.h ${INCLUDE_IDENTITIES_DIR}
192192
193193 echo -e " Moving 'networks' headers.\n"
194- mv ${SRC_NETWORKS_DIR} /abstractnetwork.h ${INCLUDE_NETWORKS_DIR}
195- mv ${SRC_NETWORKS_DIR} /devnet.h ${INCLUDE_NETWORKS_DIR}
196- mv ${SRC_NETWORKS_DIR} /mainnet.h ${INCLUDE_NETWORKS_DIR}
197- mv ${SRC_NETWORKS_DIR} /testnet.h ${INCLUDE_NETWORKS_DIR}
194+ mv ${SRC_NETWORKS_DIR} /networks.hpp ${INCLUDE_NETWORKS_DIR}
195+ mv ${SRC_NETWORKS_DIR} /devnet.hpp ${INCLUDE_NETWORKS_DIR}
196+ mv ${SRC_NETWORKS_DIR} /mainnet.hpp ${INCLUDE_NETWORKS_DIR}
197+ mv ${SRC_NETWORKS_DIR} /testnet.hpp ${INCLUDE_NETWORKS_DIR}
198198
199199 echo -e " Moving 'transactions' headers.\n"
200200 mv ${SRC_TRANSACTIONS_DIR} /builder.h ${INCLUDE_TRANSACTIONS_DIR}
@@ -205,17 +205,16 @@ else
205205 echo -e " Restoring the 'lib' directory.\n"
206206 mkdir ${SRC_LIB_DIR}
207207 mv ${EXTRAS_BACKUP_DIR} /ArduinoJson ${SRC_LIB_DIR}
208+ mv ${EXTRAS_BACKUP_DIR} /BIP66 ${SRC_LIB_DIR}
208209 mv ${EXTRAS_BACKUP_DIR} /uECC ${SRC_LIB_DIR}
209210 mv ${SRC_DIR} /bcl ${SRC_LIB_DIR}
210211 mv ${SRC_DIR} /date ${SRC_LIB_DIR}
211212 mv ${SRC_DIR} /rfc6979 ${SRC_LIB_DIR}
212- mv ${SRC_DIR} /stl ${SRC_LIB_DIR}
213213
214214 echo -e " Moving Docs back to the project root directory.\n"
215215 mv ${EXTRAS_DIR} /docs ${PROJECT_ROOT}
216216
217217 echo -e " Removing old directories 🗑\n"
218- rm -rf ${SRC_ENUMS_DIR}
219218 rm -rf ${EXTRAS_BACKUP_DIR}
220219
221220 echo -e " ****************************************\n"
0 commit comments