Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit 309429c

Browse files
Hammad-MubeenHammad-Mubeen
committed
events datatype converted
1 parent 82d3170 commit 309429c

20 files changed

+287
-253
lines changed

‎.env

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
NODE_MODE=developement
22
DATABASE_URL_LOCAL=mongodb://localhost:27017/V2-graphQL
33
DATABASE_URL_ONLINE=mongodb+srv://admin:[email protected]/V2-graphQL?retryWrites=true&w=majority
4-
FACTORY_ADDRESS=c9d0268ecea8c57ed456bf56e4fba4bf285a4588fd817832230b8fd86b71c30f
5-
token0=51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c
6-
token1=96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda
7-
pair=11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59
4+
FACTORY_ADDRESS=eed67f1280bec8429fea0fe7dab38624f0721d0d623ffce6dd0c8647d8cf440e
5+
token0=16aba5b7c0f5d5da614524b0c06f8f07e3c48040ccd0afaafaac32ea3e0d6ca1
6+
token1=d9157da9a14332fcdf0bf03b5e131112ce3c4f1fa4fa30c462c44d3d8c504115
7+
pair=d9685083521ad03c0f649d0d33e243762573538896f9b8b72955b26000889079
88

99
GRAPHQL=http://localhost:3000/graphql
1010
CHAIN_NAME=casper-test
@@ -22,7 +22,7 @@ PAIR_MASTER_KEY_PAIR_PATH=JsClients/PAIR/keys/
2222

2323

2424
ERC20_CONTRACT_NAME=erc20
25-
ERC20_TOKEN_NAME=ERC20
25+
ERC20_TOKEN_NAME=token3
2626
ERC20_TOKEN_SYMBOL=erc
2727
ERC20_DECIMALS=18
2828
ERC20_TOTAL_SUPPLY=1000
@@ -35,7 +35,7 @@ PAIR_TOTAL_SUPPLY=1000
3535

3636
FACTORY_CONTRACT_NAME=Factory
3737

38-
INSTALL_PAYMENT_AMOUNT=220000000000
38+
INSTALL_PAYMENT_AMOUNT=170000000000
3939

4040
MINT_PAYMENT_AMOUNT=5000000000
4141
MINT_AMOUNT=50
@@ -66,8 +66,8 @@ SET_FEE_TO_PAYMENT_AMOUNT=5000000000
6666
SET_FEE_TO_SETTER_PAYMENT_AMOUNT=5000000000
6767
CREATE_PAIR_PAYMENT_AMOUNT=5000000000
6868

69-
FACTORY_CONTRACT=c9d0268ecea8c57ed456bf56e4fba4bf285a4588fd817832230b8fd86b71c30f
70-
PAIR_CONTRACT=11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59
69+
FACTORY_CONTRACT=eed67f1280bec8429fea0fe7dab38624f0721d0d623ffce6dd0c8647d8cf440e
70+
PAIR_CONTRACT=d9685083521ad03c0f649d0d33e243762573538896f9b8b72955b26000889079
7171
CALLEE_CONTRACT=fbfeda8b97f056f526f20c2fc2b486d9bdbfb3e46b9a164527e57c0c86e68612
72-
TOKEN0_CONTRACT=51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c
73-
TOKEN1_CONTRACT=96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda
72+
TOKEN0_CONTRACT=16aba5b7c0f5d5da614524b0c06f8f07e3c48040ccd0afaafaac32ea3e0d6ca1
73+
TOKEN1_CONTRACT=d9157da9a14332fcdf0bf03b5e131112ce3c4f1fa4fa30c462c44d3d8c504115

‎JsClients/ERC20/keys/public_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PUBLIC KEY-----
2-
MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
2+
MCowBQYDK2VwAyEAkULIvEz/bjrjEeUuTGaHy7rxT+rOtdHw/HefJcpygsU=
33
-----END PUBLIC KEY-----

‎JsClients/ERC20/keys/public_key_hex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
1+
019142c8bc4cff6e3ae311e52e4c6687cbbaf14feaceb5d1f0fc779f25ca7282c5

‎JsClients/ERC20/keys/secret_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PRIVATE KEY-----
2-
MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
2+
MC4CAQAwBQYDK2VwBCIEIHCHw1pJnsTA+YQono8c0ruL+CQ7zx3verD6vKuVdf26
33
-----END PRIVATE KEY-----

‎JsClients/ERC20/test/install.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ const test = async () => {
6464

6565
};
6666

67-
//test();
67+
test();

‎JsClients/ERC20/test/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const sleep = (ms: number) => {
1111

1212
export const getDeploy = async (NODE_URL: string, deployHash: string) => {
1313
const client = new CasperClient(NODE_URL);
14-
let i = 300;
14+
let i = 1000;
1515
while (i != 0) {
1616
const [deploy, raw] = await client.getDeploy(deployHash);
1717
if (raw.execution_results.length !== 0){

‎JsClients/FACTORY/keys/public_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PUBLIC KEY-----
2-
MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
2+
MCowBQYDK2VwAyEAzBXFldMWQP8mB9wug4T2PeMoqZiK4IlsriYFy+dMGCQ=
33
-----END PUBLIC KEY-----

‎JsClients/FACTORY/keys/public_key_hex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
1+
01cc15c595d31640ff2607dc2e8384f63de328a9988ae0896cae2605cbe74c1824

‎JsClients/FACTORY/keys/secret_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PRIVATE KEY-----
2-
MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
2+
MC4CAQAwBQYDK2VwBCIEIEdBvTt7jYWwgCbUJDLPl5EYfSOR35tzsxU1h/Bwo1zq
33
-----END PRIVATE KEY-----

‎JsClients/FACTORY/test/install.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ const test = async () => {
5858
console.log(`... Contract Hash: ${contractHash}`);
5959
};
6060

61-
test();
61+
//test();

‎JsClients/FACTORY/test/installed.ts

+54-52
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const {
2626
TOKEN0_CONTRACT,
2727
TOKEN1_CONTRACT,
2828
PAIR_CONTRACT,
29+
FACTORY_CONTRACT,
2930
GRAPHQL
3031
} = process.env;
3132

@@ -63,17 +64,18 @@ const test = async () => {
6364
console.log(newData[4][0].data + " = " + newData[4][1].data);
6465
console.log(newData[5][0].data + " = " + newData[5][1].data);
6566

66-
67-
request(GRAPHQL!,
68-
`mutation handleNewPair( $token0: String!, $token1: String!, $pair: String!, $all_pairs_length: Int!, $timeStamp: Int!, $blockHash: String!){
69-
handleNewPair( token0: $token0, token1: $token1, pair: $pair, all_pairs_length: $all_pairs_length, timeStamp: $timeStamp, blockHash: $blockHash) {
70-
result
71-
}
67+
// (newData[2][1].data);
68+
// var token0=(newData[2][1].data).split(')');
69+
// request(GRAPHQL!,
70+
// `mutation handleNewPair( $token0: String!, $token1: String!, $pair: String!, $all_pairs_length: Int!, $timeStamp: Int!, $blockHash: String!){
71+
// handleNewPair( token0: $token0, token1: $token1, pair: $pair, all_pairs_length: $all_pairs_length, timeStamp: $timeStamp, blockHash: $blockHash) {
72+
// result
73+
// }
7274

73-
}`,
74-
{token0:newData[2][1].data, token1: newData[3][1].data, pair: newData[4][1].data, all_pairs_length: newData[5][1].data, timeStamp:timestamp, blockHash:block_hash})
75-
.then(data => console.log(data))
76-
.catch(error => console.error(error));
75+
// }`,
76+
// {token0:newData[2][1].data, token1: newData[3][1].data, pair: newData[4][1].data, all_pairs_length: newData[5][1].data, timeStamp:timestamp, blockHash:block_hash})
77+
// .then(data => console.log(data))
78+
// .catch(error => console.error(error));
7779

7880
} else {
7981
console.log(`Failed deploy of ${eventName}, deployHash: ${deploy.deployHash}`);
@@ -97,16 +99,16 @@ const test = async () => {
9799
console.log(`... Contract Hash: ${contractHash}`);
98100

99101
// We don't need hash- prefix so i'm removing it
100-
await factory.setContractHash(contractHash.slice(5));
101-
102+
// await factory.setContractHash(contractHash.slice(5));
103+
await factory.setContractHash( FACTORY_CONTRACT!);
102104

103-
//feetosetter
104-
const feetosetter = await factory.feeToSetter();
105-
console.log(`... Contract feetosetter: ${feetosetter.toString()}`);
105+
// //feetosetter
106+
// const feetosetter = await factory.feeToSetter();
107+
// console.log(`... Contract feetosetter: ${feetosetter.toString()}`);
106108

107-
//allpairs
108-
const allpairs = await factory.allPairs();
109-
console.log(`... Contract allpairs: ${allpairs}`);
109+
// //allpairs
110+
// const allpairs = await factory.allPairs();
111+
// console.log(`... Contract allpairs: ${allpairs}`);
110112

111113
//createpair
112114
const createpairDeployHash = await factory.createPair(
@@ -122,51 +124,51 @@ const test = async () => {
122124
console.log("... Pair created successfully");
123125

124126

125-
//allpairs
126-
const allPairs = await factory.allPairs();
127-
console.log(`... Contract allpairs: ${allPairs}`);
128-
// //allpairslength
129-
const allpairslength = await factory.allPairsLength();
130-
console.log(`... Contract allpairslength: ${allpairslength}`);
127+
// //allpairs
128+
// const allPairs = await factory.allPairs();
129+
// console.log(`... Contract allpairs: ${allPairs}`);
130+
// // //allpairslength
131+
// const allpairslength = await factory.allPairsLength();
132+
// console.log(`... Contract allpairslength: ${allpairslength}`);
131133

132-
//pair
133-
let pair = await factory.getPair(TOKEN0_CONTRACT!, TOKEN1_CONTRACT!);
134-
console.log(`... Pair: ${pair}`);
134+
// //pair
135+
// let pair = await factory.getPair(TOKEN0_CONTRACT!, TOKEN1_CONTRACT!);
136+
// console.log(`... Pair: ${pair}`);
135137

136-
//setfeeto
137-
const setfeetoDeployHash = await factory.setFeeTo(
138-
KEYS,
139-
KEYS.publicKey,
140-
SET_FEE_TO_PAYMENT_AMOUNT!
141-
);
142-
console.log("... Setfeeto deploy hash: ", setfeetoDeployHash);
138+
// //setfeeto
139+
// const setfeetoDeployHash = await factory.setFeeTo(
140+
// KEYS,
141+
// KEYS.publicKey,
142+
// SET_FEE_TO_PAYMENT_AMOUNT!
143+
// );
144+
// console.log("... Setfeeto deploy hash: ", setfeetoDeployHash);
143145

144-
await getDeploy(NODE_ADDRESS!, setfeetoDeployHash);
145-
console.log("... Setfeeto functionality successfull");
146+
// await getDeploy(NODE_ADDRESS!, setfeetoDeployHash);
147+
// console.log("... Setfeeto functionality successfull");
146148

147149

148-
// feeto
149-
const feeto = await factory.feeTo();
150-
console.log(`... Contract feeto: ${feeto.toString()}`);
150+
// // feeto
151+
// const feeto = await factory.feeTo();
152+
// console.log(`... Contract feeto: ${feeto.toString()}`);
151153

152-
//setfeetosetter
153-
const setfeetosetterDeployHash = await factory.setFeeToSetter(
154-
KEYS,
155-
KEYS.publicKey,
156-
SET_FEE_TO_SETTER_PAYMENT_AMOUNT!
157-
);
158-
console.log("... SetfeetosetterDeployHash deploy hash: ", setfeetosetterDeployHash);
154+
// //setfeetosetter
155+
// const setfeetosetterDeployHash = await factory.setFeeToSetter(
156+
// KEYS,
157+
// KEYS.publicKey,
158+
// SET_FEE_TO_SETTER_PAYMENT_AMOUNT!
159+
// );
160+
// console.log("... SetfeetosetterDeployHash deploy hash: ", setfeetosetterDeployHash);
159161

160-
await getDeploy(NODE_ADDRESS!, setfeetosetterDeployHash);
161-
console.log("... SetfeetoSetter functionality successfull");
162+
// await getDeploy(NODE_ADDRESS!, setfeetosetterDeployHash);
163+
// console.log("... SetfeetoSetter functionality successfull");
162164

163-
//feetosetter
164-
const feeTosSetter = await factory.feeToSetter();
165-
console.log(`... Contract feetosetter: ${feeTosSetter.toString()}`);
165+
// //feetosetter
166+
// const feeTosSetter = await factory.feeToSetter();
167+
// console.log(`... Contract feetosetter: ${feeTosSetter.toString()}`);
166168

167169
};
168170

169-
//test();
171+
test();
170172

171173
export const getPair = async (contractHash:string,TOKEN0_CONTRACT:string,TOKEN1_CONTRACT:string) => {
172174

‎JsClients/FACTORY/test/utils.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ export const sleep = (ms: number) => {
1111

1212
export const getDeploy = async (NODE_URL: string, deployHash: string) => {
1313
const client = new CasperClient(NODE_URL);
14-
let i = 300;
14+
let i = 1000;
1515
while (i != 0) {
16-
console.log("i :", i);
1716

1817
const [deploy, raw] = await client.getDeploy(deployHash);
1918
if (raw.execution_results.length !== 0) {

‎JsClients/PAIR/keys/public_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PUBLIC KEY-----
2-
MCowBQYDK2VwAyEAeQEbUdOZEMBZPZXjA2DWhJPSWbGouaKTAfb0jnPH2Fs=
2+
MCowBQYDK2VwAyEAMXHwIBQCqJCyGQ+tcbBS6jH1XiQNJ4BXR5NwJRByUbM=
33
-----END PUBLIC KEY-----

‎JsClients/PAIR/keys/public_key_hex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0179011b51d39910c0593d95e30360d68493d259b1a8b9a29301f6f48e73c7d85b
1+
013171f0201402a890b2190fad71b052ea31f55e240d27805747937025107251b3

‎JsClients/PAIR/keys/secret_key.pem

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-----BEGIN PRIVATE KEY-----
2-
MC4CAQAwBQYDK2VwBCIEIAn/ycuFSWUZkS6W5PyXAMVdFu8dp0BPPH1hKFVVTA6J
2+
MC4CAQAwBQYDK2VwBCIEILtdFGfuUGR3lDEHOYGCoznprN4pnSB/P0QL6HfKo5lx
33
-----END PRIVATE KEY-----

‎JsClients/PAIR/test/install.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ const test = async () => {
7070

7171
};
7272

73-
//test();
73+
test();

0 commit comments

Comments
 (0)