migration script updated

constant.js

@@ -4,49 +4,49 @@
 // const whiteListSecondary = "0xf4c402bf860877183e46a19382a7847ca22b51d4";
 // const auctionSecondary = "0xef7f7c4b5205a91a358de8bd8beb4345c3038922";
 
+
+// have to chanage according 
 const ownerWallet = "0xC3BdAF7a7740bF1cCA06eB5ed479EBFF1153773B";
 const whiteListSecondary = "0x68bC87e4Ac145b33D917f6CEAB7AdcF398F90771";
 const auctionSecondary = "0x58f06b0eA4F92750999e024e75D13dA7A06ab079";
 const otherSecondary = "0xb511de8f9A4B1A66D1d63125089A55bD299f0c0a";
 
-const governance = "0xd3411ca38F5256154d25E949a3F0E7E9646D4Eac";
-const escrow = "0x0Cdb8BA7e9D0A6039d9FD8556957F979A35FFB11";
+const governance = "0xd3411ca38F5256154d25E949a3F0E7E9646D4Eac"; // dynamic
+const escrow = "0x0Cdb8BA7e9D0A6039d9FD8556957F979A35FFB11"; // dynamic 
 
 
 // bancor address
-const baseTokenAddress = "0x62bd9D98d4E188e281D7B78e29334969bbE1053c";
-const relayTokenAddress = "0x8162Ff5FCF66f0B138539202D37b8B4D23C3B882";
-
-const ethTokenAddress = "0xD368b98d03855835E2923Dc000b3f9c2EBF1b27b";
-const ethBaseTokenRelayAddress = "0xDD78D22F53441b6B6216cE69E6dCAe6F7c9252b6";
-
-const bancorConverterAddress = "0xFf15fD50bC2571f496108293B306729cbE88808e";
-const bancorNetworkAddress = "0xE3042915EeaE7974bFe5a2653911d7fa05003eea";
+const baseTokenAddress = "0x98474564a00d15989f16bfb7c162c782b0e2b336";// dynamic
+const relayTokenAddress = "0x32d9a18826e76afcdc6c9df1ab79bd888ab40d2e";// dynamic
+const ethTokenAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"; // dynamic
+const ethBaseTokenRelayAddress = "0x884058297ec1FfD6C8FA4F9F2d4f066057255a03";// dynamic
+const bancorConverterAddress = "0x4eb0845ca823205D16135E64c184bd2B2D591169"; // dynamic
+const bancorNetworkAddress = "0xE3042915EeaE7974bFe5a2653911d7fa05003eea";// dynamic
 
 
 
 
-const baseLinePrice = "1814000000";
-const mainTokenHoldBack = 0;
-const etnTokenHoldBack = 0;
+const baseLinePrice = "1162999999"; // dynamic
+const mainTokenHoldBack = 0; // threre is no holdback days
+const etnTokenHoldBack = 0; 
 const stockTokenHoldBack = 0;
-const mainMaturityDays = 0;
+const mainMaturityDays = 0; // threre is no maturityDays
 const etnMaturityDays = 0;
 const stockMaturityDays = 0;
 
 const mainTokenName = "Jointer";
 const mainTokenSymbol = "JNTR";
 
-const preMintAddress = [ownerWallet,escrow];
-const preMintAmount = ["100000000000000000000000","100000000000000000000000000000"];
+const preMintAddress = [escrow,ownerWallet];
+const preMintAmount = ["11740788397000000000000000000","100000000000000000000000000000"];
 
-const byPassCode = 8195;
-const bancorCode = 16384;
+const byPassCode = 20483;
+const bancorCode = 8195;
 
-const starTime = 1598032158;
-const minAuctionTime = 60;
-const intervalTime = 60;
-const mainTokenCheckDay = 300;
+const starTime = 1600084800;
+const minAuctionTime = 82800;
+const intervalTime = 86400;
+const mainTokenCheckDay = 11;
 
 module.exports = {
     governance:governance,

contracts/InterFaces/IAuctionRegistery.sol

@@ -14,7 +14,6 @@ contract AuctionRegisteryContracts {
     bytes32 internal constant COMPANY_FUND_WALLET = "COMPANY_FUND_WALLET";
     bytes32
         internal constant COMPANY_MAIN_TOKEN_WALLET = "COMPANY_MAIN_TOKEN_WALLET";
-    bytes32 internal constant staking_TOKEN_WALLET = "staking_TOKEN_WALLET";
     bytes32 internal constant SMART_SWAP = "SMART_SWAP";
     bytes32 internal constant SMART_SWAP_P2P = "SMART_SWAP_P2P";
     bytes32 internal constant ESCROW = "ESCROW";

latestContract.json

@@ -1,12 +1,16 @@
 {
-  "AuctionRegistery": "0x6f142448Ad89804eE5A0D428EA29BC1Ca5bc7e6A",
-  "WhiteListRegistery": "0x5F290Edd5B7828CB7fdF9995E1e834E358145796",
-  "WhiteList": "0x85c35462bB2CAEFe8043b8b14c1d261b84F14D2d",
-  "MainToken": "0x488Fb87D135B02af9C204acAc2604787C98A6A70",
-  "TokenVaultRegistery": "0x60aD576b0d7295af8fce02494ca57709A845c848",
-  "TokenVault": "0x13391E95C7D8D0965c4492ae4671FDe1b4a0328c",
-  "TagAlongRegistry": "0xe614a14B66067Fd43E50f8E059b908d1E47C44C4",
-  "ProtectionRegistry": "0x5904840C8AA85d77Fd114c945171Ea93542D54ef",
-  "AuctionProtection": "0x6b4d9A382099adD68FC6BB76659B59fCBBc24502",
-  "CurrencyPrices": "0x67C6aE190d5a66fF77726cCF16cA72424a5c144C"
+  "AuctionRegistery": "0x2B44801Dc8f9021A9F3CCc3586A7Dbe9C93412cc",
+  "WhiteListRegistery": "0x270C4bC225EEF86956517E895762037cfD6D46d5",
+  "WhiteList": "0x10D1A4a113F25758f6F8c133a631E7770E6166a2",
+  "MainToken": "0xC87DF73DcAbf2DaDe8F82e7AA05844d2Fc5Db4Cb",
+  "TokenVaultRegistery": "0x01A2F96359ee6393b25D97b1f5f930BeF43EE3F8",
+  "TokenVault": "0x1Afa71A39134471861f19b9D03b409E8b58CD989",
+  "TagAlongRegistry": "0x83753C44db1caA1ed08DE027bfdeFFD4dBa6Ce9b",
+  "TagAlong": "0xFb8E70781859e666EDFe6f19f1e4fE64d5DeC54F",
+  "LiquadityRegistery": "0x948cE324B2d34ae93E4870963c4592686CCAb191",
+  "Liquadity": "0x978183AcDB74df3B5f609d7c83Cf9317c1F9d6D2",
+  "AuctionProxyRegistry": "0x4341bf943356Dce967f5798Eb1Ae06869f45a7ce",
+  "Auction": "0x5A4Bbd5a2Ac13A41b485375ECB236d4C416f3d13",
+  "ProtectionRegistry": "0x5EEA22c816C66c25B27236e024773eB8284ae2F1",
+  "AuctionProtection": "0xB108209661Ecdaf90974A7ADE9730f258b527e82"
 }

migrations/10_auction_protection.js

@@ -0,0 +1,85 @@
+const fs  = require("fs");
+const { promisify } = require('util')
+const readFileAsync = promisify(fs.readFile);
+const writeFileAsync = promisify(fs.writeFile);
+var path = require('path');
+
+const AuctionRegistery = artifacts.require("AuctionRegistery");
+const WhiteList = artifacts.require("WhiteList");
+
+
+const ProtectionRegistry = artifacts.require("ProtectionRegistry");
+const AuctionProtection = artifacts.require("AuctionProtection");
+
+const {
+  ownerWallet,
+  whiteListSecondary,
+  otherSecondary,
+  governance,
+  byPassCode,
+} = require("../constant");
+
+const protectionCode =
+  "0x41554354494f4e5f50524f54454354494f4e0000000000000000000000000000";
+
+module.exports = async function (deployer) {
+
+    currentdata = await readFileAsync(path.resolve(__dirname, '../latestContract.json'));
+    currentdata = JSON.parse(currentdata);
+
+    auctionRegistery  = currentdata.AuctionRegistery;
+    whiteList  = currentdata.WhiteList;
+
+    whiteListInstance = await WhiteList.at(whiteList);
+    auctionRegistyInstance = await AuctionRegistery.at(auctionRegistery);
+
+    await deployer.deploy(
+        ProtectionRegistry,
+        otherSecondary,
+        governance,{
+           from: ownerWallet,
+        }
+    );
+
+    protectionRegistryInstance = await ProtectionRegistry.deployed();
+
+    await deployer.deploy(AuctionProtection, {
+        from: ownerWallet,
+    });
+
+    txHash1 = await protectionRegistryInstance.addVersion(1, AuctionProtection.address, {
+        from: ownerWallet,
+    });
+
+    txHash2 = await protectionRegistryInstance.createProxy(
+        1,
+        ownerWallet,
+        otherSecondary,
+        governance,
+        auctionRegistery, {
+        from: ownerWallet,
+        }
+    );
+
+    protectionProxyAddress = await protectionRegistryInstance.proxyAddress();
+
+    protectionInstance = await AuctionProtection.at(protectionProxyAddress);
+
+    txHash3 = await whiteListInstance.addNewWallet(protectionProxyAddress, byPassCode, 0, {
+        from: whiteListSecondary,
+    });
+
+    txHash4 =  await auctionRegistyInstance.registerContractAddress(
+        protectionCode,
+        protectionProxyAddress, {
+        from: otherSecondary
+        }
+    );
+
+    currentdata["ProtectionRegistry"] = ProtectionRegistry.address;
+    currentdata["AuctionProtection"] = protectionProxyAddress;
+    await writeFileAsync(path.resolve(__dirname, '../latestContract.json'), JSON.stringify(currentdata,undefined,2));
+
+
+
+}   

migrations/4_Whitelist.js

@@ -26,6 +26,9 @@ const {
 const WhiteListCode =
   "0x57484954455f4c49535400000000000000000000000000000000000000000000";
 
+const escrowCode =
+  "0x455343524f570000000000000000000000000000000000000000000000000000";
+
 module.exports = async function (deployer) {
 
     currentdata = await readFileAsync(path.resolve(__dirname, '../latestContract.json'));
@@ -85,6 +88,13 @@ module.exports = async function (deployer) {
       }
     );
 
+    txHash4 = await AuctionRegistyInstance.registerContractAddress(
+      escrowCode,
+      escrow, {
+        from: otherSecondary
+      }
+    );
+
     currentdata["WhiteListRegistery"] = WhiteListRegistery.address;
     currentdata["WhiteList"] = whiteListProxyAdress;
     await writeFileAsync(path.resolve(__dirname, '../latestContract.json'), JSON.stringify(currentdata,undefined,2));

migrations/7_Tag_Along.js

@@ -8,8 +8,8 @@ const AuctionRegistery = artifacts.require("AuctionRegistery");
 const WhiteList = artifacts.require("WhiteList");
 
 
-const TagAlongRegistry = artifacts.require("TagAlongRegistry");
-const TagAlong = artifacts.require("AuctionTagAlong");
+const TagAlongRegistry = artifacts.require("ContributionTriggerRegistry");
+const TagAlong = artifacts.require("ContributionTrigger");
 
 const {
   ownerWallet,
@@ -20,7 +20,7 @@ const {
 } = require("../constant");
 
 const tagAlongCode =
-  "0x5441475f414c4f4e470000000000000000000000000000000000000000000000";
+  "0x434f4e545249425554494f4e5f54524947474552000000000000000000000000";
 
 module.exports = async function (deployer) {
 
@@ -47,7 +47,9 @@ module.exports = async function (deployer) {
         from: ownerWallet,
     });
 
-    txHash1 = await tagAlongRegistryInstance.addVersion(1, TagAlong.address);
+    txHash1 = await tagAlongRegistryInstance.addVersion(1, TagAlong.address, {
+        from: ownerWallet,
+    });
 
     txHash2 = await tagAlongRegistryInstance.createProxy(
         1,
@@ -75,7 +77,7 @@ module.exports = async function (deployer) {
     );
 
     currentdata["TagAlongRegistry"] = TagAlongRegistry.address;
-    currentdata["TokenVault"] = tagAlongProxyAddress;
+    currentdata["TagAlong"] = tagAlongProxyAddress;
     await writeFileAsync(path.resolve(__dirname, '../latestContract.json'), JSON.stringify(currentdata,undefined,2));
 
 }   

migrations/8_Auction_Liquadity.js

@@ -12,8 +12,8 @@ const WhiteList = artifacts.require("WhiteList");
 
 const MainToken = artifacts.require("MainToken");
 
-const LiquadityRegistery = artifacts.require("LiquadityRegistery");
-const Liquadity = artifacts.require("Liquadity");
+const LiquadityRegistery = artifacts.require("LiquidityRegistery");
+const Liquadity = artifacts.require("Liquidity");
 
 const SmartToken = TruffleContract(require("../test/bancorArtifacts/SmartToken.json"));
 const BancorConverter = TruffleContract(require("../test/bancorArtifacts/BancorConverter.json"));
@@ -26,17 +26,13 @@ const {
     otherSecondary,
     governance,
     byPassCode,
-    bancorCode,
     bancorConverterAddress,
     ethBaseTokenRelayAddress,
-    etherTokenAddress,
-    bancorNetworkAddress,
-    ethRelayTokenAddress,
     ethTokenAddress,
     baseLinePrice
 } = require("../constant");
 
-const liquadityCode = "0x4c49515541444954590000000000000000000000000000000000000000000000";
+const liquadityCode = "0x4c49515549444954590000000000000000000000000000000000000000000000";
 
 module.exports = async function (deployer) {
 
@@ -50,36 +46,7 @@ module.exports = async function (deployer) {
     whiteListInstance = await WhiteList.at(whiteList);
     auctionRegistyInstance = await AuctionRegistery.at(auctionRegistery);
 
-    await BancorConverter.setProvider(web3.currentProvider);
-    converterInstance = await BancorConverter.at(bancorConverterAddress);
 
-    await SmartToken.setProvider(web3.currentProvider);
-    relayTokenInstance = await SmartToken.at(relayTokenAddress);
-
-    txHash1 = await converterInstance.addConnector(mainToken, "500000", false, {
-        from: ownerWallet
-    });
-
-    txHash6 = await whiteListInstance.addNewWallet(bancorNetworkAddress, bancorCode, 0, {
-        from: whiteListSecondary,
-    });
-
-    txHash7 = await whiteListInstance.addNewWallet(bancorConverterAddress, bancorCode, 0, {
-        from: whiteListSecondary,
-    })
-
-    MainTokenInstance = await MainToken.at(mainToken);
-
-    txHash2 = await MainTokenInstance.transfer(bancorConverterAddress,"100000000000000000000000",{from:ownerWallet})
-
-    txHash3 = await relayTokenInstance.transferOwnership(bancorConverterAddress ,{
-        from: ownerWallet
-    });
-
-    txHash4 = await converterInstance.acceptTokenOwnership({
-        from: ownerWallet
-    })
-
     await deployer.deploy(
         LiquadityRegistery,
         otherSecondary,
@@ -95,16 +62,18 @@ module.exports = async function (deployer) {
         from: ownerWallet,
     });
 
-    txHash8 = await LiquadityRegisteryInstance.addVersion(1, Liquadity.address);
+    txHash8 = await LiquadityRegisteryInstance.addVersion(1, Liquadity.address, {
+        from: ownerWallet,
+    });
 
     txHash9 = await LiquadityRegisteryInstance.createProxy(
         1,
         bancorConverterAddress,
         baseTokenAddress,
         mainToken,
         relayTokenAddress,
-        etherTokenAddress,
-        ethRelayTokenAddress,
+        ethTokenAddress,
+        ethBaseTokenRelayAddress,
         ownerWallet,
         otherSecondary,
         governance,
@@ -129,48 +98,8 @@ module.exports = async function (deployer) {
         }
     );
 
-    ethToMainToken = [
-        ethTokenAddress,
-        ethBaseTokenRelayAddress,
-        baseTokenAddress,
-        relayTokenAddress,
-        mainToken,
-    ];
-
-    baseTokenToMainToken = [
-        baseTokenAddress,
-        relayTokenAddress,
-        mainToken,
-    ];
-
-    mainTokenTobaseToken = [
-        mainToken,
-        relayTokenAddress,
-        baseTokenAddress,
-    ];
-
-    ethToBaseToken = [
-        ethTokenAddress,
-        ethBaseTokenRelayAddress,
-        baseTokenAddress,
-    ];
-
-    baseTokenToEth = [
-        baseTokenAddress,
-        ethBaseTokenRelayAddress,
-        ethTokenAddress,
-    ];
-
-    txHash12 = await LiquadityInstance.setAllPath(
-      ethToMainToken,
-      baseTokenToMainToken,
-      mainTokenTobaseToken,
-      ethToBaseToken,
-      baseTokenToEth,
-      {
-        from: ownerWallet,
-      }
-    );
+
+
 
     currentdata["LiquadityRegistery"] = LiquadityRegistery.address;
     currentdata["Liquadity"] = LiquadityProxyAddress;