Merge pull request #23 from provable-things/remove-bytecode-generator

fix(repo): <- remove bytecode generator
provable-things · May 25, 2021 · 53cc652 · 53cc652
2 parents 782a3db + e146ecf
commit 53cc652
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 203 deletions.
diff --git a/README.md b/README.md
@@ -28,34 +28,40 @@ Test output:
 
 ```
 
-  Contract: pToken/ERC777GSN
-    ✓ Should transfer via relayer (3687ms)
-    ✓ When transferring via relay, it should pay fee in token (3033ms)
-
-  Contract: pToken/ERC777WithAdminOperator
-    ✓ OWNER cannot change the admin operator (1312ms)
-    ✓ Admin operator can change the admin operator address (189ms)
-    ✓ adminTransfer() should fail if the caller is not the admin operator (351ms)
-    ✓ adminTransfer() should transfer tokens (1175ms)
-
-  Contract: pToken
-    ✓ `redeem()` function should burn tokens & emit correct events (8591ms)
-    ✓ `mint()` w/out data should mint tokens & emit correct events (1545ms)
-    ✓ `mint()` w/out data should return true if successful (718ms)
-    ✓ `mint()` cannot mint to zero address (453ms)
-    ✓ 'mint()' only 0x6acA...d1bE can mint (1200ms)
-    ✓ `mint()` w/ data should mint tokens & emit correct events (879ms)
-    ✓ 0x6acA...d1bE has 'admin' and 'minter' role (392ms)
-    ✓ 0x6acA...d1bE can grant 'minter' role (539ms)
-    ✓ 0x6acA...d1bE can revoke 'minter' role (730ms)
-    ✓ newly added minter should be able to mint tokens & emit correct events (763ms)
-    ✓ Should get redeem fxn call data correctly (2140ms)
-    ✓ Should grant minter role to EOA (259ms)
-    ✓ Should upgrade contract (2232ms)
-    ✓ User balance should remain after contract upgrade (1796ms)
-    ✓ Should revert when minting tokens with the contract address as the recipient (485ms)
-
-
-  21 passing (2m)
+  Contract: Erc20Vault
+    ✓ PNETWORK_ADDRESS can add appoved token address (188ms)
+    ✓ NON_PNETWORK_ADDRESS cannot add appoved token address (176ms)
+    ✓ PNETWORK_ADDRESS can remove appoved token address (278ms)
+    ✓ NON_PNETWORK_ADDRESS cannot remove appoved token address (279ms)
+    ✓ Should NOT peg in if token is not supported (98ms)
+    ✓ Should NOT peg in if token is supported but insufficient allowance approved (234ms)
+    ✓ Should NOT peg in if token is supported and sufficient allowance approved, but token amount is 0 (206ms)
+    ✓ Should peg in if token is supported and sufficient allowance approved (459ms)
+    ✓ NON_PNETWORK_ADDRESS cannot peg out (374ms)
+    ✓ PNETWORK_ADDRESS cannot peg out if insufficient balance (154ms)
+    ✓ PNETWORK_ADDRESS can peg out with sufficient balance (503ms)
+    ✓ PNETWORK_ADDRESS can migrate (842ms)
+    ✓ Non PNETWORK_ADDRESS cannot migrate (91ms)
+    ✓ Token addresses sent to constructor should be supported (356ms)
+    ✓ PNETWORK_ADDRESS can migrate single (648ms)
+    ✓ Non PNETWORK_ADDRESS cannot migrateSingle (62ms)
+    ✓ Automatically pegIn on ERC777 send (653ms)
+    ✓ Should pegIn an ERC777 (722ms)
+    ✓ PNETWORK_ADDRESS can migrate with ERC777 (1023ms)
+    ✓ Should peg in wETH (278ms)
+    ✓ Should peg out wETH (428ms)
+    ✓ Should peg in with user data (496ms)
+    ✓ Should peg in WETH_CONTRACT with user data (347ms)
+    ✓ Can peg out with user data (972ms)
+    ✓ Should migrate all token balances (4023ms)
+    ✓ Should peg out wETH to smart-contract w/ expensive fallback function (480ms)
+    ✓ Should be able to peg out wETH with user data to a smart-contract (457ms)
+    ✓ Should not fail to peg out wETH with user data to an EOA (348ms)
+    ✓ PNETWORK_ADDRESS can change PNETWORK_ADDRESS (228ms)
+    ✓ NON_PNETWORK_ADDRESS cannot change PNETWORK_ADDRESS (111ms)
+    ✓ Should not be able to set pNetwork address to the zero address (119ms)
+
+
+  31 passing (41s)
 
 ```
diff --git a/bytecode-generator.js b/bytecode-generator.js
diff --git a/lib/artifact-utils.js b/lib/artifact-utils.js
diff --git a/lib/bytecode-utils.js b/lib/bytecode-utils.js
diff --git a/lib/check-address.js b/lib/check-address.js
diff --git a/lib/constants.js b/lib/constants.js
diff --git a/lib/generate-bytecode.js b/lib/generate-bytecode.js
diff --git a/lib/get-web3.js b/lib/get-web3.js
diff --git a/lib/prepare-constructor-args.js b/lib/prepare-constructor-args.js
diff --git a/lib/run-truffle-compile.js b/lib/run-truffle-compile.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "ptokens-perc20-smart-contract",
-  "version": "1.10.0",
-  "description": "The pToken pERC20-on-EOS-vault smart-contract",
+  "name": "ptokens-erc20-smart-contract",
+  "version": "1.11.0",
+  "description": "The pToken ERC20 vault smart-contract",
   "main": "index.js",
   "scripts": {
     "test": "echo 'Please see README.md for details on how to run the tests!'"