Review other dirs

theQRL · Oct 14, 2023 · 1dc37f6 · 1dc37f6
1 parent 10c7162
commit 1dc37f6
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 233 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -18,7 +18,7 @@ component_management:
         target: 80%
 
   individual_components:
-    - component_id: "web3"
+    - component_id: "@theqrl/web3"
       paths:
           - /packages/web3/src/
     - component_id: "@theqrl/web3-core"
@@ -29,25 +29,25 @@ component_management:
           - /packages/web3-errors/src/
     - component_id: "@theqrl/web3-zond"
       paths:
-          - /packages/web3-eth/src/
+          - /packages/web3-zond/src/
     - component_id: "@theqrl/web3-zond-abi"
       paths:
-          - /packages/web3-eth-abi/src/
+          - /packages/web3-zond-abi/src/
     - component_id: "@theqrl/web3-zond-accounts"
       paths:
-          - /packages/web3-eth-accounts/src/
+          - /packages/web3-zond-accounts/src/
     - component_id: "@theqrl/web3-zond-contract"
       paths:
-          - /packages/web3-eth-contract/src/
+          - /packages/web3-zond-contract/src/
     - component_id: "@theqrl/web3-zond-ens"
       paths:
-          - /packages/web3-eth-ens/src/
+          - /packages/web3-zond-ens/src/
     - component_id: "@theqrl/web3-zond-iban"
       paths:
-          - /packages/web3-eth-iban/src/
+          - /packages/web3-zond-iban/src/
     - component_id: "@theqrl/web3-zond-personal"
       paths:
-          - /packages/web3-eth-personal/src/
+          - /packages/web3-zond-personal/src/
     - component_id: "@theqrl/web3-net"
       paths:
           - /packages/web3-net/src/

diff --git a/docs/docs/guides/web3_plugin_guide/plugin_authors.md b/docs/docs/guides/web3_plugin_guide/plugin_authors.md
@@ -27,7 +27,7 @@ If the version `web3@4.0.2`, was not available yet. You can use the version `web
 	"name": "web3-plugin-custom-rpc-methods",
 	"version": "0.1.0",
 	"peerDependencies": {
-		"web3": ">= 4.0.2 < 5"
+		"@theqrl/web3": ">= 4.0.2 < 5"
 	}
 }
 ```

diff --git a/scripts/accounts.json b/scripts/accounts.json
@@ -2,5 +2,81 @@
 	{
 		"address": "0x2099d76d9a34cdd2694c4dc703930a6fbbc1d402",
 		"seed": "0xf29f58aff0b00de2844f7e20bd9eeaacc379150043beeb328335817512b29fbb7184da84a092f842b2a06d72a24a5d28"
+	},
+	{
+		"address": "0x2018dcff6a42061e4203d3b8cbf48e9b890cbdf2",
+		"seed": "0xd665bd59e560503aba4f32edbc3d49523c602657e169cb6d71cce62e282a1320c0f12536318d7b5d713b296b8a35233b"
+	},
+	{
+		"address": "0x206f5f53d348954856a6d2cde75ad6381945fb46",
+		"seed": "0x09b35d23d7ce46e4e0bf9f1ca390fd8685d7e4a9d0f2394a92a0d996de2a46b5df1a797896e0201679eea6115a094bd7"
+	},
+	{
+		"address": "0x200baff4ccd0232a8039542fb6853c937288d539",
+		"seed": "0x6c34babe75bd8e89992b41ecd727670d5c1013497254e6f126988882e803c479781b4a70f1004a15fe272215184f0a87"
+	},
+	{
+		"address": "0x20190d72c776da149e6be9a740843b2aa516b435",
+		"seed": "0xe081ca82a5e27a85a08a5461702b1bbe53975668bb039e14585835e407f32df9825d513735819711858b5bb5fcfc20a4"
+	},
+	{
+		"address": "0x2012dc756a28cd861828566227ca9407b16cb430",
+		"seed": "0x12a51c0b027b1f186e8e5e0725aca9e500959d7b61b8c5fbbcc55c017f7099b7576626ebc6dfc0d5f958c0b7eef7a03f"
+	},
+	{
+		"address": "0x20afd8594239b128b89a2cb98664c3b6c143e545",
+		"seed": "0x7c222d6ee5d1a29917ab599df10d066e2cf9ee5019e94103d71a9baf6e93657e48e53d12861a01d32fed3bd30af63cd9"
+	},
+	{
+		"address": "0x20362229f3620aa9fc6f9e718b74b092d68a651d",
+		"seed": "0x938c40672eed562cfdfda2aaf8c3926cddd62786dfcca494341c581ca303624162f8adb723368a5b9fcb3bbd1e8701bd"
+	},
+	{
+		"address": "0x20f9b5ee58ebeb9a0334834713398dd027077cef",
+		"seed": "0xa6dbb8426ea1970ec05fccebad158bb5f919583ef382d8775d1befef3f59ae9082c162f12607312e239b2e1b166028f5"
+	},
+	{
+		"address": "0x202c2dba1eca06363928a2796b46d6aac72c8d07",
+		"seed": "0xbff087a5010451c48c407be1ec8163338856d36f936b3b0e1eccf1713d506586aba14e0a3d6fc4a365fffcd559fcb819"
+	},
+	{
+		"address": "0x201cc324d6aeed1b2e132d10ddc0d296efa13623",
+		"seed": "0x4ca660357e9f2d22552b7879743eb06283ed3271259a6038ea72ee9099507bc0728ed38aca05dc8beb57f6d17a1a8129"
+	},
+	{
+		"address": "0x20c90ae344f184f203dafbbcaad8213cc27d78d4",
+		"seed": "0xaa7428aaee14351a3f3ebcb52fcc6b7e9a1010b7b358ea053f6d02ebf9d2d0eb61de990078c362d5944514868b004aa3"
+	},
+	{
+		"address": "0x20c520521c46cd98d44710ca4099724a8c5f879a",
+		"seed": "0x4b00c38b9e2b801325516526e0afcfdfa0131de1c40007ced748c0dfd339e03c089fdd9801a2f9ef8110645019219536"
+	},
+	{
+		"address": "0x202799d52882d79416942d5e0f67a5c7d0207db2",
+		"seed": "0xca5509299cbe74a67b7f360665ad6b095948751c0781e64b17b2c85b5b695d0f9eb9c9088af45da5ec06796aacbcaced"
+	},
+	{
+		"address": "0x20fafa263a40c87983db4aab53e8e5730cc3e0ee",
+		"seed": "0x5cec2a9ca787d783a19a478f25743f45670c77ab0bff924054cfc1d3a8337e919ec87facd3591c756fea9e341f0be439"
+	},
+	{
+		"address": "0x20def16543aa72e32edd9ad303a24edb99f1e610",
+		"seed": "0x17a0e3f9d267219dde8e3be23ddfc871818acd70137b848d684f48342a4d7dc3f3f01780d604b0ca4b3740c8e3aa0e6e"
+	},
+	{
+		"address": "0x20ec6e6c991c52d062bf9c13ec5e86b84934266b",
+		"seed": "0xd44a06098bd30a9af1c002e2af6b69c424c365077dfb25dc5006937a96e9d67843b603919050373909e592b2d2048e01"
+	},
+	{
+		"address": "0x20346f7f1a6d6138fd4396240d9bbf3ba125619b",
+		"seed": "0xea426d4c79d6c46f45dd9405a4681cf886f08224425587a8583fae573021527fc20e8d37ea4603aa655f2b3b7e633141"
+	},
+	{
+		"address": "0x20a3724b874158b13a78f6f8d7cdc182b21caaef",
+		"seed": "0x9594ec1d9965d471f2cc50d65f9fbab265f793c4f67a1fa248cb533a54b0d78b6af36292a43de54838d694337ac49645"
+	},
+	{
+		"address": "0x201bdf510d5aa66d1b5db98dfb0f30d40b6ea47d",
+		"seed": "0x89e5dc721ff0b98aac7f03f30763d54e31b8c773d6b98a8e81c73e78039897270fcbf94ae0f2422d294dbf17256e7051"
 	}
 ]
diff --git a/scripts/gen_accounts.js b/scripts/gen_accounts.js
@@ -1,5 +1,5 @@
-const { Personal } = require('web3-eth-personal');
-const { Web3Eth } = require('web3-eth');
+const { Personal } = require('@theqrl/web3-zond-personal');
+const { Web3Zond } = require('@theqrl/web3-zond');
 const tempAccountList = require('./accounts.json');
 
 const getEnvVar = name => (global.Cypress ? Cypress.env(name) : process.env[name]);
@@ -20,7 +20,7 @@ const addAccount = async (address, privateKey) => {
 		accountList = await web3Personal.getAccounts();
 		mainAcc = accountList[0];
 	}
-	const web3Eth = new Web3Eth(clientUrl);
+	const web3Zond = new Web3Zond(clientUrl);
 
 	if (!accountList.find(acc => acc.address === address)) {
 		await web3Personal.importRawKey(

diff --git a/scripts/geth_binary.sh b/scripts/geth_binary.sh
@@ -59,12 +59,12 @@ start() {
     download
 	if [ -z "${ORIGARGS[1]}" ]; then
 		echo "Starting geth..."
-		echo "geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net --dev --mine --dev.period=0 "
-		${TMP_FOLDER}/geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net --dev --mine --dev.period=0 --rpc.enabledeprecatedpersonal
+		echo "geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net --dev --mine --dev.period=0 "
+		${TMP_FOLDER}/geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net --dev --mine --dev.period=0 --rpc.enabledeprecatedpersonal
 	else
 		echo "Starting geth..."
-		echo "geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net --dev --mine --dev.period=0  &>/dev/null &"
-		${TMP_FOLDER}/geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net --dev --mine --dev.period=0 --rpc.enabledeprecatedpersonal &>/dev/null &
+		echo "geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net --dev --mine --dev.period=0  &>/dev/null &"
+		${TMP_FOLDER}/geth --ipcpath $IPC_PATH --nodiscover --nousb --ws --ws.addr 0.0.0.0 --ws.port $WEB3_SYSTEM_TEST_PORT --http --http.addr 0.0.0.0 --http.port $WEB3_SYSTEM_TEST_PORT --allow-insecure-unlock --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net --dev --mine --dev.period=0 --rpc.enabledeprecatedpersonal &>/dev/null &
 		echo "Waiting for geth..."
 		npx wait-port -t 10000 "$WEB3_SYSTEM_TEST_PORT"
 	fi
@@ -75,8 +75,8 @@ startSync() {
 
     ${TMP_FOLDER}/geth --datadir ./tmp/data1 init ./scripts/genesis.json
     ${TMP_FOLDER}/geth --datadir ./tmp/data2 init ./scripts/genesis.json
-    ${TMP_FOLDER}/geth --datadir ./tmp/data1 --ipcpath $IPC_PATH_1 --nodiscover --networkid 1234 --ws --ws.addr 0.0.0.0 --ws.port 18545 --http --http.addr 0.0.0.0 --http.port 18545 --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net &>/dev/null &
-    ${TMP_FOLDER}/geth --datadir ./tmp/data2 --ipcpath $IPC_PATH_2 --nodiscover --networkid 1234 --port 30304 --authrpc.port 8552 --ws --ws.addr 0.0.0.0 --ws.port 28545 --http --http.addr 0.0.0.0 --http.port 28545 --http.api personal,web3,eth,admin,debug,txpool,net --ws.api personal,web3,eth,admin,debug,miner,txpool,net &>/dev/null &
+    ${TMP_FOLDER}/geth --datadir ./tmp/data1 --ipcpath $IPC_PATH_1 --nodiscover --networkid 1234 --ws --ws.addr 0.0.0.0 --ws.port 18545 --http --http.addr 0.0.0.0 --http.port 18545 --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net &>/dev/null &
+    ${TMP_FOLDER}/geth --datadir ./tmp/data2 --ipcpath $IPC_PATH_2 --nodiscover --networkid 1234 --port 30304 --authrpc.port 8552 --ws --ws.addr 0.0.0.0 --ws.port 28545 --http --http.addr 0.0.0.0 --http.port 28545 --http.api personal,web3,zond,admin,debug,txpool,net --ws.api personal,web3,zond,admin,debug,miner,txpool,net &>/dev/null &
 
     npx wait-port -t 10000 18545
     npx wait-port -t 10000 28545

diff --git a/tools/eslint-config-base-web3/package.json b/tools/eslint-config-base-web3/package.json
@@ -7,8 +7,7 @@
 	"license": "LGPL-3.0",
 	"keywords": [
 		"eslint",
-		"ethereum",
-		"eth",
+		"zond",
 		"web3",
 		"web3js",
 		"web3.js",

diff --git a/tools/web3-plugin-example/package.json b/tools/web3-plugin-example/package.json
@@ -45,18 +45,18 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3": "^4.1.2",
+		"@theqrl/web3": "^4.1.2",
 		"@theqrl/web3-core": "^4.2.0",
 		"@theqrl/web3-zond-abi": "^4.1.2",
 		"@theqrl/web3-zond-contract": "^4.1.0",
 		"@theqrl/web3-types": "^1.2.0",
-		"web3-utils": "^4.0.6"
+		"@theqrl/web3-utils": "^4.0.6"
 	},
 	"peerDependencies": {
 		"@theqrl/web3-core": ">= 4.1.1 < 5",
 		"@theqrl/web3-zond-abi": ">= 4.1.1 < 5",
 		"@theqrl/web3-zond-contract": ">= 4.0.5 < 5",
 		"@theqrl/web3-types": ">= 1.1.1 < 5",
-		"web3-utils": ">= 4.0.5 < 5"
+		"@theqrl/web3-utils": ">= 4.0.5 < 5"
 	}
 }
diff --git a/tools/web3-plugin-example/src/contract_method_wrappers.ts b/tools/web3-plugin-example/src/contract_method_wrappers.ts
@@ -16,8 +16,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Web3PluginBase } from '@theqrl/web3-core';
 import Contract from '@theqrl/web3-zond-contract';
-import { Address, ContractAbi, DataFormat, DEFAULT_RETURN_FORMAT, Numbers } from 'web3-types';
-import { format, numberToHex } from 'web3-utils';
+import { Address, ContractAbi, DataFormat, DEFAULT_RETURN_FORMAT, Numbers } from '@theqrl/web3-types';
+import { format, numberToHex } from '@theqrl/web3-utils';
 // eslint-disable-next-line require-extensions/require-extensions
 import { ERC20TokenAbi } from './ERC20Token';
 // eslint-disable-next-line require-extensions/require-extensions

diff --git a/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts b/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
+import Web3 from '@theqrl/web3';
 import { DEFAULT_RETURN_FORMAT } from 'web3-types';
 
 import { ContractMethodWrappersPlugin } from '../../src/contract_method_wrappers';

diff --git a/tools/web3-plugin-example/test/web3_export_helper.ts b/tools/web3-plugin-example/test/web3_export_helper.ts
@@ -14,6 +14,6 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
+import Web3 from '@theqrl/web3';
 
 export { Web3 };