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

Commit

Permalink
events datatype converted
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hammad-Mubeen
Hammad-Mubeen committed Nov 3, 2021
1 parent 82d3170 commit 309429c
Show file tree
Hide file tree
Showing 20 changed files with 287 additions and 253 deletions.
20 changes: 10 additions & 10 deletions .env
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
NODE_MODE=developement
DATABASE_URL_LOCAL=mongodb://localhost:27017/V2-graphQL
DATABASE_URL_ONLINE=mongodb+srv://admin:[email protected]/V2-graphQL?retryWrites=true&w=majority
FACTORY_ADDRESS=c9d0268ecea8c57ed456bf56e4fba4bf285a4588fd817832230b8fd86b71c30f
token0=51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c
token1=96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda
pair=11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59
FACTORY_ADDRESS=eed67f1280bec8429fea0fe7dab38624f0721d0d623ffce6dd0c8647d8cf440e
token0=16aba5b7c0f5d5da614524b0c06f8f07e3c48040ccd0afaafaac32ea3e0d6ca1
token1=d9157da9a14332fcdf0bf03b5e131112ce3c4f1fa4fa30c462c44d3d8c504115
pair=d9685083521ad03c0f649d0d33e243762573538896f9b8b72955b26000889079

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


ERC20_CONTRACT_NAME=erc20
ERC20_TOKEN_NAME=ERC20
ERC20_TOKEN_NAME=token3
ERC20_TOKEN_SYMBOL=erc
ERC20_DECIMALS=18
ERC20_TOTAL_SUPPLY=1000
Expand All @@ -35,7 +35,7 @@ PAIR_TOTAL_SUPPLY=1000

FACTORY_CONTRACT_NAME=Factory

INSTALL_PAYMENT_AMOUNT=220000000000
INSTALL_PAYMENT_AMOUNT=170000000000

MINT_PAYMENT_AMOUNT=5000000000
MINT_AMOUNT=50
Expand Down Expand Up @@ -66,8 +66,8 @@ SET_FEE_TO_PAYMENT_AMOUNT=5000000000
SET_FEE_TO_SETTER_PAYMENT_AMOUNT=5000000000
CREATE_PAIR_PAYMENT_AMOUNT=5000000000

FACTORY_CONTRACT=c9d0268ecea8c57ed456bf56e4fba4bf285a4588fd817832230b8fd86b71c30f
PAIR_CONTRACT=11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59
FACTORY_CONTRACT=eed67f1280bec8429fea0fe7dab38624f0721d0d623ffce6dd0c8647d8cf440e
PAIR_CONTRACT=d9685083521ad03c0f649d0d33e243762573538896f9b8b72955b26000889079
CALLEE_CONTRACT=fbfeda8b97f056f526f20c2fc2b486d9bdbfb3e46b9a164527e57c0c86e68612
TOKEN0_CONTRACT=51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c
TOKEN1_CONTRACT=96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda
TOKEN0_CONTRACT=16aba5b7c0f5d5da614524b0c06f8f07e3c48040ccd0afaafaac32ea3e0d6ca1
TOKEN1_CONTRACT=d9157da9a14332fcdf0bf03b5e131112ce3c4f1fa4fa30c462c44d3d8c504115
2 changes: 1 addition & 1 deletion JsClients/ERC20/keys/public_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
MCowBQYDK2VwAyEAkULIvEz/bjrjEeUuTGaHy7rxT+rOtdHw/HefJcpygsU=
-----END PUBLIC KEY-----
2 changes: 1 addition & 1 deletion JsClients/ERC20/keys/public_key_hex
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
019142c8bc4cff6e3ae311e52e4c6687cbbaf14feaceb5d1f0fc779f25ca7282c5
2 changes: 1 addition & 1 deletion JsClients/ERC20/keys/secret_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
MC4CAQAwBQYDK2VwBCIEIHCHw1pJnsTA+YQono8c0ruL+CQ7zx3verD6vKuVdf26
-----END PRIVATE KEY-----
2 changes: 1 addition & 1 deletion JsClients/ERC20/test/install.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ const test = async () => {

};

//test();
test();
2 changes: 1 addition & 1 deletion JsClients/ERC20/test/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const sleep = (ms: number) => {

export const getDeploy = async (NODE_URL: string, deployHash: string) => {
const client = new CasperClient(NODE_URL);
let i = 300;
let i = 1000;
while (i != 0) {
const [deploy, raw] = await client.getDeploy(deployHash);
if (raw.execution_results.length !== 0){
Expand Down
2 changes: 1 addition & 1 deletion JsClients/FACTORY/keys/public_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
MCowBQYDK2VwAyEAzBXFldMWQP8mB9wug4T2PeMoqZiK4IlsriYFy+dMGCQ=
-----END PUBLIC KEY-----
2 changes: 1 addition & 1 deletion JsClients/FACTORY/keys/public_key_hex
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
01cc15c595d31640ff2607dc2e8384f63de328a9988ae0896cae2605cbe74c1824
2 changes: 1 addition & 1 deletion JsClients/FACTORY/keys/secret_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
MC4CAQAwBQYDK2VwBCIEIEdBvTt7jYWwgCbUJDLPl5EYfSOR35tzsxU1h/Bwo1zq
-----END PRIVATE KEY-----
2 changes: 1 addition & 1 deletion JsClients/FACTORY/test/install.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ const test = async () => {
console.log(`... Contract Hash: ${contractHash}`);
};

test();
//test();
106 changes: 54 additions & 52 deletions JsClients/FACTORY/test/installed.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const {
TOKEN0_CONTRACT,
TOKEN1_CONTRACT,
PAIR_CONTRACT,
FACTORY_CONTRACT,
GRAPHQL
} = process.env;

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


request(GRAPHQL!,
`mutation handleNewPair( $token0: String!, $token1: String!, $pair: String!, $all_pairs_length: Int!, $timeStamp: Int!, $blockHash: String!){
handleNewPair( token0: $token0, token1: $token1, pair: $pair, all_pairs_length: $all_pairs_length, timeStamp: $timeStamp, blockHash: $blockHash) {
result
}
// (newData[2][1].data);
// var token0=(newData[2][1].data).split(')');
// request(GRAPHQL!,
// `mutation handleNewPair( $token0: String!, $token1: String!, $pair: String!, $all_pairs_length: Int!, $timeStamp: Int!, $blockHash: String!){
// handleNewPair( token0: $token0, token1: $token1, pair: $pair, all_pairs_length: $all_pairs_length, timeStamp: $timeStamp, blockHash: $blockHash) {
// result
// }

}`,
{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})
.then(data => console.log(data))
.catch(error => console.error(error));
// }`,
// {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})
// .then(data => console.log(data))
// .catch(error => console.error(error));

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

// We don't need hash- prefix so i'm removing it
await factory.setContractHash(contractHash.slice(5));

// await factory.setContractHash(contractHash.slice(5));
await factory.setContractHash( FACTORY_CONTRACT!);

//feetosetter
const feetosetter = await factory.feeToSetter();
console.log(`... Contract feetosetter: ${feetosetter.toString()}`);
// //feetosetter
// const feetosetter = await factory.feeToSetter();
// console.log(`... Contract feetosetter: ${feetosetter.toString()}`);

//allpairs
const allpairs = await factory.allPairs();
console.log(`... Contract allpairs: ${allpairs}`);
// //allpairs
// const allpairs = await factory.allPairs();
// console.log(`... Contract allpairs: ${allpairs}`);

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


//allpairs
const allPairs = await factory.allPairs();
console.log(`... Contract allpairs: ${allPairs}`);
// //allpairslength
const allpairslength = await factory.allPairsLength();
console.log(`... Contract allpairslength: ${allpairslength}`);
// //allpairs
// const allPairs = await factory.allPairs();
// console.log(`... Contract allpairs: ${allPairs}`);
// // //allpairslength
// const allpairslength = await factory.allPairsLength();
// console.log(`... Contract allpairslength: ${allpairslength}`);

//pair
let pair = await factory.getPair(TOKEN0_CONTRACT!, TOKEN1_CONTRACT!);
console.log(`... Pair: ${pair}`);
// //pair
// let pair = await factory.getPair(TOKEN0_CONTRACT!, TOKEN1_CONTRACT!);
// console.log(`... Pair: ${pair}`);

//setfeeto
const setfeetoDeployHash = await factory.setFeeTo(
KEYS,
KEYS.publicKey,
SET_FEE_TO_PAYMENT_AMOUNT!
);
console.log("... Setfeeto deploy hash: ", setfeetoDeployHash);
// //setfeeto
// const setfeetoDeployHash = await factory.setFeeTo(
// KEYS,
// KEYS.publicKey,
// SET_FEE_TO_PAYMENT_AMOUNT!
// );
// console.log("... Setfeeto deploy hash: ", setfeetoDeployHash);

await getDeploy(NODE_ADDRESS!, setfeetoDeployHash);
console.log("... Setfeeto functionality successfull");
// await getDeploy(NODE_ADDRESS!, setfeetoDeployHash);
// console.log("... Setfeeto functionality successfull");


// feeto
const feeto = await factory.feeTo();
console.log(`... Contract feeto: ${feeto.toString()}`);
// // feeto
// const feeto = await factory.feeTo();
// console.log(`... Contract feeto: ${feeto.toString()}`);

//setfeetosetter
const setfeetosetterDeployHash = await factory.setFeeToSetter(
KEYS,
KEYS.publicKey,
SET_FEE_TO_SETTER_PAYMENT_AMOUNT!
);
console.log("... SetfeetosetterDeployHash deploy hash: ", setfeetosetterDeployHash);
// //setfeetosetter
// const setfeetosetterDeployHash = await factory.setFeeToSetter(
// KEYS,
// KEYS.publicKey,
// SET_FEE_TO_SETTER_PAYMENT_AMOUNT!
// );
// console.log("... SetfeetosetterDeployHash deploy hash: ", setfeetosetterDeployHash);

await getDeploy(NODE_ADDRESS!, setfeetosetterDeployHash);
console.log("... SetfeetoSetter functionality successfull");
// await getDeploy(NODE_ADDRESS!, setfeetosetterDeployHash);
// console.log("... SetfeetoSetter functionality successfull");

//feetosetter
const feeTosSetter = await factory.feeToSetter();
console.log(`... Contract feetosetter: ${feeTosSetter.toString()}`);
// //feetosetter
// const feeTosSetter = await factory.feeToSetter();
// console.log(`... Contract feetosetter: ${feeTosSetter.toString()}`);

};

//test();
test();

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

Expand Down
3 changes: 1 addition & 2 deletions JsClients/FACTORY/test/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ export const sleep = (ms: number) => {

export const getDeploy = async (NODE_URL: string, deployHash: string) => {
const client = new CasperClient(NODE_URL);
let i = 300;
let i = 1000;
while (i != 0) {
console.log("i :", i);

const [deploy, raw] = await client.getDeploy(deployHash);
if (raw.execution_results.length !== 0) {
Expand Down
2 changes: 1 addition & 1 deletion JsClients/PAIR/keys/public_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEAeQEbUdOZEMBZPZXjA2DWhJPSWbGouaKTAfb0jnPH2Fs=
MCowBQYDK2VwAyEAMXHwIBQCqJCyGQ+tcbBS6jH1XiQNJ4BXR5NwJRByUbM=
-----END PUBLIC KEY-----
2 changes: 1 addition & 1 deletion JsClients/PAIR/keys/public_key_hex
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0179011b51d39910c0593d95e30360d68493d259b1a8b9a29301f6f48e73c7d85b
013171f0201402a890b2190fad71b052ea31f55e240d27805747937025107251b3
2 changes: 1 addition & 1 deletion JsClients/PAIR/keys/secret_key.pem
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIAn/ycuFSWUZkS6W5PyXAMVdFu8dp0BPPH1hKFVVTA6J
MC4CAQAwBQYDK2VwBCIEILtdFGfuUGR3lDEHOYGCoznprN4pnSB/P0QL6HfKo5lx
-----END PRIVATE KEY-----
2 changes: 1 addition & 1 deletion JsClients/PAIR/test/install.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ const test = async () => {

};

//test();
test();
Loading

0 comments on commit 309429c

Please sign in to comment.