diff --git a/.env b/.env
index f59ad2a9..09f01f48 100644
--- a/.env
+++ b/.env
@@ -1,10 +1,10 @@
 NODE_MODE=developement
 DATABASE_URL_LOCAL=mongodb://localhost:27017/V2-graphQL
 DATABASE_URL_ONLINE=mongodb+srv://admin:scytalelabs@cluster0-9yop5.mongodb.net/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
@@ -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
@@ -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
@@ -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
\ No newline at end of file
+TOKEN0_CONTRACT=16aba5b7c0f5d5da614524b0c06f8f07e3c48040ccd0afaafaac32ea3e0d6ca1
+TOKEN1_CONTRACT=d9157da9a14332fcdf0bf03b5e131112ce3c4f1fa4fa30c462c44d3d8c504115
\ No newline at end of file
diff --git a/JsClients/ERC20/keys/public_key.pem b/JsClients/ERC20/keys/public_key.pem
index b967282a..5424d7eb 100644
--- a/JsClients/ERC20/keys/public_key.pem
+++ b/JsClients/ERC20/keys/public_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PUBLIC KEY-----
-MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
+MCowBQYDK2VwAyEAkULIvEz/bjrjEeUuTGaHy7rxT+rOtdHw/HefJcpygsU=
 -----END PUBLIC KEY-----
diff --git a/JsClients/ERC20/keys/public_key_hex b/JsClients/ERC20/keys/public_key_hex
index 98293b5b..633cc4a3 100644
--- a/JsClients/ERC20/keys/public_key_hex
+++ b/JsClients/ERC20/keys/public_key_hex
@@ -1 +1 @@
-010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
\ No newline at end of file
+019142c8bc4cff6e3ae311e52e4c6687cbbaf14feaceb5d1f0fc779f25ca7282c5
\ No newline at end of file
diff --git a/JsClients/ERC20/keys/secret_key.pem b/JsClients/ERC20/keys/secret_key.pem
index 8ba7814d..bb6863bf 100644
--- a/JsClients/ERC20/keys/secret_key.pem
+++ b/JsClients/ERC20/keys/secret_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
+MC4CAQAwBQYDK2VwBCIEIHCHw1pJnsTA+YQono8c0ruL+CQ7zx3verD6vKuVdf26
 -----END PRIVATE KEY-----
diff --git a/JsClients/ERC20/test/install.ts b/JsClients/ERC20/test/install.ts
index a5b669e8..463da7d6 100644
--- a/JsClients/ERC20/test/install.ts
+++ b/JsClients/ERC20/test/install.ts
@@ -64,4 +64,4 @@ const test = async () => {
 
 };
 
-//test();
+test();
diff --git a/JsClients/ERC20/test/utils.ts b/JsClients/ERC20/test/utils.ts
index 297be077..b00e42d7 100644
--- a/JsClients/ERC20/test/utils.ts
+++ b/JsClients/ERC20/test/utils.ts
@@ -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){
diff --git a/JsClients/FACTORY/keys/public_key.pem b/JsClients/FACTORY/keys/public_key.pem
index b967282a..44935150 100644
--- a/JsClients/FACTORY/keys/public_key.pem
+++ b/JsClients/FACTORY/keys/public_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PUBLIC KEY-----
-MCowBQYDK2VwAyEAC4nSMMGXMUBZafr9MOwOEO22kK1/hnZElsGkxJ0LyMs=
+MCowBQYDK2VwAyEAzBXFldMWQP8mB9wug4T2PeMoqZiK4IlsriYFy+dMGCQ=
 -----END PUBLIC KEY-----
diff --git a/JsClients/FACTORY/keys/public_key_hex b/JsClients/FACTORY/keys/public_key_hex
index 98293b5b..edf6af05 100644
--- a/JsClients/FACTORY/keys/public_key_hex
+++ b/JsClients/FACTORY/keys/public_key_hex
@@ -1 +1 @@
-010b89d230c19731405969fafd30ec0e10edb690ad7f86764496c1a4c49d0bc8cb
\ No newline at end of file
+01cc15c595d31640ff2607dc2e8384f63de328a9988ae0896cae2605cbe74c1824
\ No newline at end of file
diff --git a/JsClients/FACTORY/keys/secret_key.pem b/JsClients/FACTORY/keys/secret_key.pem
index 8ba7814d..d4461bbe 100644
--- a/JsClients/FACTORY/keys/secret_key.pem
+++ b/JsClients/FACTORY/keys/secret_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MC4CAQAwBQYDK2VwBCIEIMHRPkN2pEU2AVi+0YDupXFGxyyNyTWzul7J+AneHHdY
+MC4CAQAwBQYDK2VwBCIEIEdBvTt7jYWwgCbUJDLPl5EYfSOR35tzsxU1h/Bwo1zq
 -----END PRIVATE KEY-----
diff --git a/JsClients/FACTORY/test/install.ts b/JsClients/FACTORY/test/install.ts
index eea3a93f..58d01bdc 100644
--- a/JsClients/FACTORY/test/install.ts
+++ b/JsClients/FACTORY/test/install.ts
@@ -58,4 +58,4 @@ const test = async () => {
   console.log(`... Contract Hash: ${contractHash}`);
 };
 
-test();
+//test();
diff --git a/JsClients/FACTORY/test/installed.ts b/JsClients/FACTORY/test/installed.ts
index bf49c5c8..6b483c59 100644
--- a/JsClients/FACTORY/test/installed.ts
+++ b/JsClients/FACTORY/test/installed.ts
@@ -26,6 +26,7 @@ const {
   TOKEN0_CONTRACT,
   TOKEN1_CONTRACT,
   PAIR_CONTRACT,
+  FACTORY_CONTRACT,
   GRAPHQL
 } = process.env;
 
@@ -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}`);
@@ -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(
@@ -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) => {
   
diff --git a/JsClients/FACTORY/test/utils.ts b/JsClients/FACTORY/test/utils.ts
index 2b978644..89b98923 100644
--- a/JsClients/FACTORY/test/utils.ts
+++ b/JsClients/FACTORY/test/utils.ts
@@ -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) {
diff --git a/JsClients/PAIR/keys/public_key.pem b/JsClients/PAIR/keys/public_key.pem
index 99bc9b3f..54f01fbc 100644
--- a/JsClients/PAIR/keys/public_key.pem
+++ b/JsClients/PAIR/keys/public_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PUBLIC KEY-----
-MCowBQYDK2VwAyEAeQEbUdOZEMBZPZXjA2DWhJPSWbGouaKTAfb0jnPH2Fs=
+MCowBQYDK2VwAyEAMXHwIBQCqJCyGQ+tcbBS6jH1XiQNJ4BXR5NwJRByUbM=
 -----END PUBLIC KEY-----
diff --git a/JsClients/PAIR/keys/public_key_hex b/JsClients/PAIR/keys/public_key_hex
index dddec432..d6a5e11f 100644
--- a/JsClients/PAIR/keys/public_key_hex
+++ b/JsClients/PAIR/keys/public_key_hex
@@ -1 +1 @@
-0179011b51d39910c0593d95e30360d68493d259b1a8b9a29301f6f48e73c7d85b
\ No newline at end of file
+013171f0201402a890b2190fad71b052ea31f55e240d27805747937025107251b3
\ No newline at end of file
diff --git a/JsClients/PAIR/keys/secret_key.pem b/JsClients/PAIR/keys/secret_key.pem
index 315ada1d..adaea469 100644
--- a/JsClients/PAIR/keys/secret_key.pem
+++ b/JsClients/PAIR/keys/secret_key.pem
@@ -1,3 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MC4CAQAwBQYDK2VwBCIEIAn/ycuFSWUZkS6W5PyXAMVdFu8dp0BPPH1hKFVVTA6J
+MC4CAQAwBQYDK2VwBCIEILtdFGfuUGR3lDEHOYGCoznprN4pnSB/P0QL6HfKo5lx
 -----END PRIVATE KEY-----
diff --git a/JsClients/PAIR/test/install.ts b/JsClients/PAIR/test/install.ts
index 8d9432be..e57dae7c 100644
--- a/JsClients/PAIR/test/install.ts
+++ b/JsClients/PAIR/test/install.ts
@@ -70,4 +70,4 @@ const test = async () => {
 
 };
 
-//test();
+test();
diff --git a/JsClients/PAIR/test/installed.ts b/JsClients/PAIR/test/installed.ts
index 07f45492..93dc4384 100644
--- a/JsClients/PAIR/test/installed.ts
+++ b/JsClients/PAIR/test/installed.ts
@@ -36,7 +36,8 @@ const {
   TOKEN0_CONTRACT,
   TOKEN1_CONTRACT,
   PAIR_CONTRACT_NAME,
-  GRAPHQL
+  GRAPHQL,
+  PAIR_CONTRACT
 } = process.env;
 
 // const TOKEN_META = new Map(parseTokenMeta(process.env.TOKEN_META!));
@@ -74,30 +75,55 @@ const test = async () => {
           
           let newData = JSON.parse(JSON.stringify(result.value()));
 
-          console.log(eventName+ " Event result: ");
-          console.log(newData[0][0].data + " = " + newData[0][1].data);
-          console.log(newData[1][0].data + " = " + newData[1][1].data);
-          console.log(newData[2][0].data + " = " + newData[2][1].data);
-          console.log(newData[3][0].data + " = " + newData[3][1].data);
-          console.log(newData[4][0].data + " = " + newData[4][1].data);
-          console.log(newData[5][0].data + " = " + newData[5][1].data);
-          console.log(newData[6][0].data + " = " + newData[6][1].data);
-          console.log(newData[7][0].data + " = " + newData[7][1].data);
-          console.log(newData[8][0].data + " = " + newData[8][1].data);
-          console.log(newData[9][0].data + " = " + newData[9][1].data);
+          // console.log(eventName+ " Event result: ");
+          // console.log(newData[0][0].data + " = " + newData[0][1].data);
+          // console.log(newData[1][0].data + " = " + newData[1][1].data);
+          // console.log(newData[2][0].data + " = " + newData[2][1].data);
+          // console.log(newData[3][0].data + " = " + newData[3][1].data);
+          // console.log(newData[4][0].data + " = " + newData[4][1].data);
+          // console.log(newData[5][0].data + " = " + newData[5][1].data);
+          // console.log(newData[6][0].data + " = " + newData[6][1].data);
+          // console.log(newData[7][0].data + " = " + newData[7][1].data);
+          // console.log(newData[8][0].data + " = " + newData[8][1].data);
+          // console.log(newData[9][0].data + " = " + newData[9][1].data);
 
           if(eventName=="transfer")
           {
-            request(GRAPHQL!,
-              `mutation handleTransfer( $from: String!, $to: String!, $value: Int!, $pairAddress: String!, $deployHash: String!, $timeStamp: Int!, $blockHash: String!){
-              handleTransfer( from: $from, to: $to, value: $value, pairAddress: $pairAddress, deployHash: $deployHash, timeStamp: $timeStamp, blockHash: $blockHash) {
-                 result
-               }
+            console.log(eventName+ " Event result: ");
+            console.log(newData[0][0].data + " = " + newData[0][1].data);
+            console.log(newData[1][0].data + " = " + newData[1][1].data);
+
+            console.log(newData[2][0].data + " = " + newData[2][1].data);
+            console.log(newData[3][0].data + " = " + newData[3][1].data);
+            console.log(newData[4][0].data + " = " + newData[4][1].data);
+            console.log(newData[5][0].data + " = " + newData[5][1].data);
+
+            var from1=(newData[2][1].data).split('(');
+            var from=from1[1].split(')');
+
+            var to1=(newData[4][1].data).split('(');
+            var to=to1[1].split(')');
+
+            var value=newData[5][1].data;
+
+            var pair1=newData[3][1].data.split('(');
+            var pair=pair1[1].split(')');
+
+            console.log("from: ", from[0]);
+            console.log("to: ", to[0]);
+            console.log("value: ", parseInt(value));
+            console.log("pair: ", pair[0]);
+
+            // request(GRAPHQL!,
+            //   `mutation handleTransfer( $from: String!, $to: String!, $value: Int!, $pairAddress: String!, $deployHash: String!, $timeStamp: Int!, $blockHash: String!){
+            //   handleTransfer( from: $from, to: $to, value: $value, pairAddress: $pairAddress, deployHash: $deployHash, timeStamp: $timeStamp, blockHash: $blockHash) {
+            //      result
+            //    }
              
-              }`,
-               {from:newData[2][1].data, to: newData[3][1].data, value: newData[4][1].data, pairAddress: newData[5][1].data, deployHash:deploy.deployHash,timeStamp:timestamp, blockHash:block_hash})
-               .then(data => console.log(data))
-               .catch(error => console.error(error));
+            //   }`,
+            //    {from:newData[2][1].data, to: newData[3][1].data, value: newData[4][1].data, pairAddress: newData[5][1].data, deployHash:deploy.deployHash,timeStamp:timestamp, blockHash:block_hash})
+            //    .then(data => console.log(data))
+            //    .catch(error => console.error(error));
           }
           else if (eventName=="mint")
           {
@@ -175,80 +201,81 @@ const test = async () => {
   console.log(`... Contract Hash: ${contractHash}`);
 
   // We don't need hash- prefix so i'm removing it
-  await pair.setContractHash(contractHash.slice(5));
+  //await pair.setContractHash(contractHash.slice(5));
+  await pair.setContractHash(PAIR_CONTRACT!);
 
-  //name
-  const name = await pair.name();
-  console.log(`... Contract name: ${name}`);
+  // //name
+  // const name = await pair.name();
+  // console.log(`... Contract name: ${name}`);
 
-  //symbol
-  const symbol = await pair.symbol();
-  console.log(`... Contract symbol: ${symbol}`);
+  // //symbol
+  // const symbol = await pair.symbol();
+  // console.log(`... Contract symbol: ${symbol}`);
 
-  //initialize
-  const initializeDeployHash = await pair.initialize(
-    KEYS,
-    TOKEN0_CONTRACT!,
-    TOKEN1_CONTRACT!,
-    FACTORY_CONTRACT!,
-    INITIALIZE_PAYMENT_AMOUNT!
-  );
-  console.log("... Initialize deploy hash: ", initializeDeployHash);
+  // //initialize
+  // const initializeDeployHash = await pair.initialize(
+  //   KEYS,
+  //   TOKEN0_CONTRACT!,
+  //   TOKEN1_CONTRACT!,
+  //   FACTORY_CONTRACT!,
+  //   INITIALIZE_PAYMENT_AMOUNT!
+  // );
+  // console.log("... Initialize deploy hash: ", initializeDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, initializeDeployHash);
-  console.log("... Token Initialized successfully");
+  // await getDeploy(NODE_ADDRESS!, initializeDeployHash);
+  // console.log("... Token Initialized successfully");
 
 
-  //erc20mint
-  const erc20MintToken0DeployHash = await pair.erc20MintMethod(
-    KEYS,
-    TOKEN0_CONTRACT!,
-    "1000"!,
-    MINT_PAYMENT_AMOUNT!
-  );
-  console.log("...ERC20 Mint deploy hash: ", erc20MintToken0DeployHash);
+  // //erc20mint
+  // const erc20MintToken0DeployHash = await pair.erc20MintMethod(
+  //   KEYS,
+  //   TOKEN0_CONTRACT!,
+  //   "1000"!,
+  //   MINT_PAYMENT_AMOUNT!
+  // );
+  // console.log("...ERC20 Mint deploy hash: ", erc20MintToken0DeployHash);
 
 
-  await getDeploy(NODE_ADDRESS!, erc20MintToken0DeployHash);
-  console.log("...ERC20 Token minted successfully");
+  // await getDeploy(NODE_ADDRESS!, erc20MintToken0DeployHash);
+  // console.log("...ERC20 Token minted successfully");
 
 
-  //erc20mint
-  const erc20MintToken1DeployHash = await pair.erc20MintMethod(
-    KEYS,
-    TOKEN1_CONTRACT!,
-    "1000"!,
-    MINT_PAYMENT_AMOUNT!
-  );
-  console.log("...ERC20 Mint deploy hash: ", erc20MintToken1DeployHash);
+  // //erc20mint
+  // const erc20MintToken1DeployHash = await pair.erc20MintMethod(
+  //   KEYS,
+  //   TOKEN1_CONTRACT!,
+  //   "1000"!,
+  //   MINT_PAYMENT_AMOUNT!
+  // );
+  // console.log("...ERC20 Mint deploy hash: ", erc20MintToken1DeployHash);
 
-  await getDeploy(NODE_ADDRESS!, erc20MintToken1DeployHash);
-  console.log("...ERC20 Token minted successfully");
+  // await getDeploy(NODE_ADDRESS!, erc20MintToken1DeployHash);
+  // console.log("...ERC20 Token minted successfully");
 
-  //token0
-  const token0 = await pair.token0();
-  console.log(`... Contract token0: ${token0}`);
+  // //token0
+  // const token0 = await pair.token0();
+  // console.log(`... Contract token0: ${token0}`);
 
-  //token1
-  const token1 = await pair.token1();
-  console.log(`... Contract token1: ${token1}`);
+  // //token1
+  // const token1 = await pair.token1();
+  // console.log(`... Contract token1: ${token1}`);
 
-  //treasuryfee
-  const treasuryfee = await pair.treasuryFee();
-  console.log(`... Contract treasuryfee: ${treasuryfee}`);
+  // //treasuryfee
+  // const treasuryfee = await pair.treasuryFee();
+  // console.log(`... Contract treasuryfee: ${treasuryfee}`);
 
-  //totalsupply
-  let totalSupply = await pair.totalSupply();
-  console.log(`... Total supply: ${totalSupply}`);
+  // //totalsupply
+  // let totalSupply = await pair.totalSupply();
+  // console.log(`... Total supply: ${totalSupply}`);
 
-  //balanceof
-  let balance = await pair.balanceOf(KEYS.publicKey);
-  console.log(`... Balance of account ${KEYS.publicKey.toAccountHashStr()}`);
-  console.log(`... Balance: ${balance}`);
+  // //balanceof
+  // let balance = await pair.balanceOf(KEYS.publicKey);
+  // console.log(`... Balance of account ${KEYS.publicKey.toAccountHashStr()}`);
+  // console.log(`... Balance: ${balance}`);
 
-  //balanceof
-  let nonce = await pair.nonce(KEYS.publicKey);
-  console.log(`... Nonce: ${nonce}`);
+  // //balanceof
+  // let nonce = await pair.nonce(KEYS.publicKey);
+  // console.log(`... Nonce: ${nonce}`);
 
   //allowance
   // let allowance = await pair.allowance(KEYS.publicKey, KEYS.publicKey);
@@ -256,44 +283,44 @@ const test = async () => {
 
   //erc20_mint
   //mint
-  const erc20mint0DeployHash = await pair.erc20Mint(
-    KEYS,
-    TOKEN0_CONTRACT!,
-    "1000"!,
-    MINT_PAYMENT_AMOUNT!
-  );
-  console.log("... Mint deploy hash: ", erc20mint0DeployHash);
+  // const erc20mint0DeployHash = await pair.erc20Mint(
+  //   KEYS,
+  //   TOKEN0_CONTRACT!,
+  //   "1000"!,
+  //   MINT_PAYMENT_AMOUNT!
+  // );
+  // console.log("... Mint deploy hash: ", erc20mint0DeployHash);
 
-  await getDeploy(NODE_ADDRESS!, erc20mint0DeployHash);
-  console.log("... Token minted successfully");
+  // await getDeploy(NODE_ADDRESS!, erc20mint0DeployHash);
+  // console.log("... Token minted successfully");
 
 
-  //erc20mint
-  const erc20mint1DeployHash = await pair.erc20Mint(
-    KEYS,
-    TOKEN1_CONTRACT!,
-    "1000"!,
-    MINT_PAYMENT_AMOUNT!
-  );
-  console.log("... Mint deploy hash: ", erc20mint1DeployHash);
+  // //erc20mint
+  // const erc20mint1DeployHash = await pair.erc20Mint(
+  //   KEYS,
+  //   TOKEN1_CONTRACT!,
+  //   "1000"!,
+  //   MINT_PAYMENT_AMOUNT!
+  // );
+  // console.log("... Mint deploy hash: ", erc20mint1DeployHash);
 
-  await getDeploy(NODE_ADDRESS!, erc20mint1DeployHash);
-  console.log("... Token minted successfully");
+  // await getDeploy(NODE_ADDRESS!, erc20mint1DeployHash);
+  // console.log("... Token minted successfully");
 
 
 
-  //sync
-  const syncDeployHash = await pair.sync(
-    KEYS,
-    KEYS.publicKey,
-    SYNC_PAYMENT_AMOUNT!
-  );
-  console.log("... sync deploy hash: ", syncDeployHash);
+  // //sync
+  // const syncDeployHash = await pair.sync(
+  //   KEYS,
+  //   KEYS.publicKey,
+  //   SYNC_PAYMENT_AMOUNT!
+  // );
+  // console.log("... sync deploy hash: ", syncDeployHash);
 
 
 
-  await getDeploy(NODE_ADDRESS!, syncDeployHash);
-  console.log("... Sync functionality successfull");
+  // await getDeploy(NODE_ADDRESS!, syncDeployHash);
+  // console.log("... Sync functionality successfull");
 
 
   //mint
@@ -318,21 +345,21 @@ const test = async () => {
   // await getDeploy(NODE_ADDRESS!, burnDeployHash);
   // console.log("... Token burned successfully");
 
-  //totalsupply
-  totalSupply = await pair.totalSupply();
-  console.log(`... Total supply: ${totalSupply}`);
+  // //totalsupply
+  // totalSupply = await pair.totalSupply();
+  // console.log(`... Total supply: ${totalSupply}`);
 
-  //approve
-  const approveDeployHash = await pair.approve(
-    KEYS,
-    KEYS.publicKey,
-    APPROVE_AMOUNT!,
-    APPROVE_PAYMENT_AMOUNT!
-  );
-  console.log("... Approve deploy hash: ", approveDeployHash);
+  // //approve
+  // const approveDeployHash = await pair.approve(
+  //   KEYS,
+  //   KEYS.publicKey,
+  //   APPROVE_AMOUNT!,
+  //   APPROVE_PAYMENT_AMOUNT!
+  // );
+  // console.log("... Approve deploy hash: ", approveDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, approveDeployHash);
-  console.log("... Token approved successfully");
+  // await getDeploy(NODE_ADDRESS!, approveDeployHash);
+  // console.log("... Token approved successfully");
 
   //transfer
   const transferDeployHash = await pair.transfer(
@@ -346,63 +373,63 @@ const test = async () => {
   await getDeploy(NODE_ADDRESS!, transferDeployHash);
   console.log("... Token transfer successfully");
 
-  //transfer_from
-  const transferfromDeployHash = await pair.transferFrom(
-    KEYS,
-    KEYS.publicKey,
-    KEYS.publicKey,
-    TRANSFER_FROM_AMOUNT!,
-    TRANSFER_FROM_PAYMENT_AMOUNT!
-  );
-  console.log("... TransferFrom deploy hash: ", transferfromDeployHash);
+  // //transfer_from
+  // const transferfromDeployHash = await pair.transferFrom(
+  //   KEYS,
+  //   KEYS.publicKey,
+  //   KEYS.publicKey,
+  //   TRANSFER_FROM_AMOUNT!,
+  //   TRANSFER_FROM_PAYMENT_AMOUNT!
+  // );
+  // console.log("... TransferFrom deploy hash: ", transferfromDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, transferfromDeployHash);
-  console.log("... Token transfer successfully");
+  // await getDeploy(NODE_ADDRESS!, transferfromDeployHash);
+  // console.log("... Token transfer successfully");
 
-  //skim
-  const skimDeployHash = await pair.skim(
-    KEYS,
-    KEYS.publicKey,
-    SKIM_PAYMENT_AMOUNT!
-  );
-  console.log("... skim deploy hash: ", skimDeployHash);
+  // //skim
+  // const skimDeployHash = await pair.skim(
+  //   KEYS,
+  //   KEYS.publicKey,
+  //   SKIM_PAYMENT_AMOUNT!
+  // );
+  // console.log("... skim deploy hash: ", skimDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, skimDeployHash);
-  console.log("... Skim functionality successfull");
+  // await getDeploy(NODE_ADDRESS!, skimDeployHash);
+  // console.log("... Skim functionality successfull");
 
 
-  //swap
-  const swapDeployHash = await pair.swap(
-    KEYS,
-    "10",
-    "20",
-    KEYS.publicKey,
-    "",
-    SWAP_PAYMENT_AMOUNT!
-  );
-  console.log("... swap deploy hash: ", swapDeployHash);
+  // //swap
+  // const swapDeployHash = await pair.swap(
+  //   KEYS,
+  //   "10",
+  //   "20",
+  //   KEYS.publicKey,
+  //   "",
+  //   SWAP_PAYMENT_AMOUNT!
+  // );
+  // console.log("... swap deploy hash: ", swapDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, swapDeployHash);
-  console.log("... Swap functionality successfull");
+  // await getDeploy(NODE_ADDRESS!, swapDeployHash);
+  // console.log("... Swap functionality successfull");
 
-  //settreasuryfeepercent
-  const settreasuryfeepercentDeployHash = await pair.setTreasuryFeePercent(
-    KEYS,
-    "10",
-    SET_TREASURY_FEE_PERCENT_PAYMENT_AMOUNT!
-  );
-  console.log("... setTreasuryFeePercent deploy hash: ", settreasuryfeepercentDeployHash);
+  // //settreasuryfeepercent
+  // const settreasuryfeepercentDeployHash = await pair.setTreasuryFeePercent(
+  //   KEYS,
+  //   "10",
+  //   SET_TREASURY_FEE_PERCENT_PAYMENT_AMOUNT!
+  // );
+  // console.log("... setTreasuryFeePercent deploy hash: ", settreasuryfeepercentDeployHash);
 
-  await getDeploy(NODE_ADDRESS!, settreasuryfeepercentDeployHash);
-  console.log("... setTreasuryFeePercent functionality successfull");
+  // await getDeploy(NODE_ADDRESS!, settreasuryfeepercentDeployHash);
+  // console.log("... setTreasuryFeePercent functionality successfull");
 
-  //treasuryfee
-  const treasuryFee = await pair.treasuryFee();
-  console.log(`... Contract treasuryfee: ${treasuryFee}`);
+  // //treasuryfee
+  // const treasuryFee = await pair.treasuryFee();
+  // console.log(`... Contract treasuryfee: ${treasuryFee}`);
 
 };
 
-//test();
+test();
 
 export const balanceOf = async (contractHash:string, key:string) => {
   
diff --git a/JsClients/PAIR/test/utils.ts b/JsClients/PAIR/test/utils.ts
index 49cd5515..89b98923 100644
--- a/JsClients/PAIR/test/utils.ts
+++ b/JsClients/PAIR/test/utils.ts
@@ -13,7 +13,6 @@ export const getDeploy = async (NODE_URL: string, deployHash: string) => {
   const client = new CasperClient(NODE_URL);
   let i = 1000;
   while (i != 0) {
-    console.log('i', i);
 
     const [deploy, raw] = await client.getDeploy(deployHash);
     if (raw.execution_results.length !== 0) {
diff --git a/graphql/helpers.js b/graphql/helpers.js
index dbd68e8a..5cca3b79 100644
--- a/graphql/helpers.js
+++ b/graphql/helpers.js
@@ -198,7 +198,6 @@ async function createUser(address) {
 async function createLiquiditySnapshot(position, timeStamp, blockHash) {
   try {
     // let timestamp = event.block.timestamp.toI32();
-    let timestamp = 1000;
     let bundle = await Bundle.findOne({ id: "1" });
     let pair = await Pair.findOne({ id: position.pair });
     //let pair = await Pair.findOne({ id: "hash-0000000000000000000000000000000000000000000000000000000000000000" });
diff --git a/test.js b/test.js
index 6c7921fa..2251f340 100644
--- a/test.js
+++ b/test.js
@@ -45,7 +45,7 @@
 
 // console.log("data: ",data[0][1].data);
 
-const { request } = require('graphql-request');
+//const { request } = require('graphql-request');
 
 // request('http://localhost:3000/graphql',
 //  `mutation handleTransfer( $pairAddress: String!, $from: String!, $to: String!, $value: Int!, $deployHash: String!, $timeStamp: Int!, $blockHash: String!){
@@ -58,14 +58,22 @@ const { request } = require('graphql-request');
 //   .then(data => console.log(data))
 //   .catch(error => console.error(error));
 
-request('http://localhost:3000/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) {
-    id
-  }
+// request('http://localhost:3000/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) {
+//     id
+//   }
+
+//  }`,
+//   {token0:'51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c', token1: '96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda', pair: '11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59', all_pairs_length: 5, timeStamp:1000, blockHash:'0000000000000000000000000000000000000000000000000000000000000000'})
+//   .then(data => console.log(data))
+//   .catch(error => console.error(error));
+
 
- }`,
-  {token0:'51254d70d183f4b1e59ee5d5b0c76d3c3a81d0366278beecc05b546d49a9835c', token1: '96b0431770a34f5b651a43c830f3c8537e7c44f2cb8191d7efbcca2379785cda', pair: '11f6e1b2d9566ab6d796f026b1d4bd36b71664c4ee8805fbc9cdca406607cd59', all_pairs_length: 5, timeStamp:1000, blockHash:'0000000000000000000000000000000000000000000000000000000000000000'})
-  .then(data => console.log(data))
-  .catch(error => console.error(error));
+var data="Key::hash(45d8a07febaf15b0b0c5ace02533c9d278fd2b6e31b84e7a7abd0c7478e57ea2)";
+var from=data.split('(');
+var from1=from[1].split(')');
+console.log("from: ", from1[0]);
+var data1="1";
 
+console.log("from: ", parseInt(data1));
\ No newline at end of file