Merge pull request #13 from ipelaez-simtlix/master

BGA-363 WBTC smart contract deployment on Tron
WrappedBTC · Dec 13, 2020 · b0ffa83 · b0ffa83
2 parents 74368f0 + 9c011e0
commit b0ffa83
Show file tree

Hide file tree

Showing 66 changed files with 5,159 additions and 548 deletions.
diff --git a/README.md b/README.md
@@ -1,22 +1,7 @@
-This repository has the contracts that implement the wrapped btc token.
+This repository has the contracts that implement the wrapped tokens.
 
-# Installation
-
-    npm install
-
-# Compilation
-
-    npm run compile
-
-# Testing
-
-    npm test
-
-# Testing Coverage
-
-    npm run coverage
-
-# Deployment
-
-    node scripts/deployer.js --input-file [file] --gas-price-gwei [gwei] --rpc-url [url]
+# Ethereum network
+[ethereumV2/README.md](ethereumV2/README.md)
 
+# Tron network
+[tron/README.md](tron/README.md)
diff --git a/.solcover.js → ethereumV2/.solcover.js b/.solcover.js → ethereumV2/.solcover.js
diff --git a/ethereumV2/README.md b/ethereumV2/README.md
@@ -0,0 +1,21 @@
+This repository has the contracts that implement the wrapped btc token on Ethereum network.
+
+# Installation
+
+    npm install
+
+# Compilation
+
+    npm run compile
+
+# Testing
+
+    npm test
+
+# Testing Coverage
+
+    npm run coverage
+
+# Deployment
+
+    node deployer.js --input-file [file] --gas-price-gwei [gwei] --rpc-url [url]
diff --git a/contracts/Migrations.sol → ethereumV2/contracts/Migrations.sol b/contracts/Migrations.sol → ethereumV2/contracts/Migrations.sol
diff --git a/contracts/controller/Controller.sol → ...eumV2/contracts/controller/Controller.sol b/contracts/controller/Controller.sol → ...eumV2/contracts/controller/Controller.sol
diff --git a/contracts/controller/ControllerInterface.sol → ...tracts/controller/ControllerInterface.sol b/contracts/controller/ControllerInterface.sol → ...tracts/controller/ControllerInterface.sol
diff --git a/contracts/factory/Factory.sol → ethereumV2/contracts/factory/Factory.sol b/contracts/factory/Factory.sol → ethereumV2/contracts/factory/Factory.sol
diff --git a/contracts/factory/Members.sol → ethereumV2/contracts/factory/Members.sol b/contracts/factory/Members.sol → ethereumV2/contracts/factory/Members.sol
diff --git a/contracts/factory/MembersInterface.sol → ...V2/contracts/factory/MembersInterface.sol b/contracts/factory/MembersInterface.sol → ...V2/contracts/factory/MembersInterface.sol
diff --git a/contracts/mock/BasicTokenMock.sol → ethereumV2/contracts/mock/BasicTokenMock.sol b/contracts/mock/BasicTokenMock.sol → ethereumV2/contracts/mock/BasicTokenMock.sol
diff --git a/contracts/mock/IndexedMappingWrapper.sol → .../contracts/mock/IndexedMappingWrapper.sol b/contracts/mock/IndexedMappingWrapper.sol → .../contracts/mock/IndexedMappingWrapper.sol
diff --git a/contracts/token/WBTC.sol → ethereumV2/contracts/token/WBTC.sol b/contracts/token/WBTC.sol → ethereumV2/contracts/token/WBTC.sol
diff --git a/ethereumV2/contracts/token/WETH.sol b/ethereumV2/contracts/token/WETH.sol
@@ -0,0 +1,12 @@
+pragma solidity 0.4.24;
+
+import "openzeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/DetailedERC20.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/MintableToken.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/BurnableToken.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/PausableToken.sol";
+import "../token/WrappedToken.sol";
+
+
+contract WETH is WrappedToken, DetailedERC20("Wrapped ETH", "WETH", 18) {}
+
diff --git a/contracts/token/WXRP.sol → ethereumV2/contracts/token/WXRP.sol b/contracts/token/WXRP.sol → ethereumV2/contracts/token/WXRP.sol
diff --git a/contracts/token/WrappedToken.sol → ethereumV2/contracts/token/WrappedToken.sol b/contracts/token/WrappedToken.sol → ethereumV2/contracts/token/WrappedToken.sol
diff --git a/contracts/utils/IndexedMapping.sol → ...reumV2/contracts/utils/IndexedMapping.sol b/contracts/utils/IndexedMapping.sol → ...reumV2/contracts/utils/IndexedMapping.sol
diff --git a/contracts/utils/OwnableContract.sol → ...eumV2/contracts/utils/OwnableContract.sol b/contracts/utils/OwnableContract.sol → ...eumV2/contracts/utils/OwnableContract.sol
diff --git a/contracts/utils/OwnableContractOwner.sol → .../contracts/utils/OwnableContractOwner.sol b/contracts/utils/OwnableContractOwner.sol → .../contracts/utils/OwnableContractOwner.sol
diff --git a/scripts/deployer.js → ethereumV2/deployer.js b/scripts/deployer.js → ethereumV2/deployer.js
diff --git a/scripts/deployerImplementation.js → ethereumV2/deployerImplementation.js b/scripts/deployerImplementation.js → ethereumV2/deployerImplementation.js
@@ -18,10 +18,10 @@ module.exports.deploy = async function (inputFile, gasPriceGwei, rpcUrl, dontSen
     let privateKeyMerchant, accountMerchant, accountMerchantAddress;
     let accountMultiSigAddress;
 
-    const controllerContractPath = path.join(__dirname, "../contracts/controller/");
-    const factoryContractPath = path.join(__dirname, "../contracts/factory/");
-    const tokenContractPath = path.join(__dirname, "../contracts/token/");
-    const utilsContractPath = path.join(__dirname, "../contracts/utils/");
+    const controllerContractPath = path.join(__dirname, "./contracts/controller/");
+    const factoryContractPath = path.join(__dirname, "./contracts/factory/");
+    const tokenContractPath = path.join(__dirname, "./contracts/token/");
+    const utilsContractPath = path.join(__dirname, "./contracts/utils/");
     const tokenFileName = tokenName + '.sol';
 
     const compilationInput = {
@@ -37,10 +37,10 @@ module.exports.deploy = async function (inputFile, gasPriceGwei, rpcUrl, dontSen
     };
 
     function findImports (_path) {
-        if(_path.includes("openzeppelin-solidity")) 
+        if(_path.includes("openzeppelin-solidity"))
             return { contents: fs.readFileSync("node_modules/" + _path, 'utf8') }
         else
-            return { contents: fs.readFileSync(path.join(__dirname, "../contracts/", _path), 'utf8') }
+            return { contents: fs.readFileSync(path.join(__dirname, "./contracts/", _path), 'utf8') }
     }
 
     function sleep(ms){
@@ -53,7 +53,7 @@ module.exports.deploy = async function (inputFile, gasPriceGwei, rpcUrl, dontSen
 
         let content = JSON.parse(fs.readFileSync(inputFile, 'utf8'));
         privateKey = content["privateKey"]
-        privateKeyCustodian = content["privateKeyCustodian"] 
+        privateKeyCustodian = content["privateKeyCustodian"]
         privateKeyMerchant = content["privateKeyMerchant"]
         accountMultiSigAddress = content["accountMultiSigAddress"]
 

diff --git a/scripts/deployerInputTestrpc.json → ethereumV2/deployerInputTestrpc.json b/scripts/deployerInputTestrpc.json → ethereumV2/deployerInputTestrpc.json
diff --git a/migrations/1_initial_migration.js → ethereumV2/migrations/1_initial_migration.js b/migrations/1_initial_migration.js → ethereumV2/migrations/1_initial_migration.js