Revert early merge of peggy2 contracts as they broke other integratio…

…n tests.

.github/workflows/smart-contracts.yml

@@ -17,10 +17,16 @@ jobs:
       - name: Use Node.js
         uses: actions/[email protected]
         with:
-          node-version: '18.x'
+          node-version: '14.x'
 
       - name: Install dependencies
         run: npm install
 
-      - name: Run hardhat tests
-        run: make tests
+      - name: Install truffle
+        run: npm i -g truffle
+
+      - name: Test Setup
+        run: npm run test:setup
+
+      - name: Run truffle tests
+        run: npm run test

smart-contracts/.gitignore

@@ -9,8 +9,3 @@ venv
 /artifacts/
 /cache/
 /.idea/
-relayerdb/
-witnessdb/
-*.pyc
-package-lock.json
-.hardhat-compile

smart-contracts/Makefile

@@ -2,44 +2,30 @@
 
 SHELL:=/bin/bash
 
-include Makefile.smartContracts
-include Makefile.artifacts
-gofiles=$(artifacts:.json=.go)
+setup:
+	python3 -m venv venv ; source ./venv/bin/activate ; pip3 install -r requirements.txt
+	yarn
 
-all: ${artifacts}
+# Run slither over entire directory
+# `make slither`
+slither: setup
+	slither . || true
 
-install: all
+# Simple static analysis in a human-readable report over entire directory
+# `make slither-pretty-summary`
+slither-pretty-summary: setup
+	slither . --print human-summary
 
-artifacts/%.go: artifacts/%.json
-	bash scripts/do_abigen.sh $< ../cmd/ebrelayer/contract/generated
+# Check for ERC 20|223|777|721|165|1820 conformance
+# `make conformance CONTRACT=./contracts/ContractFile.sol CONTRACT_NAME=ContractName`
+erc-conformance: setup
+	slither-check-erc ${CONTRACT} ${CONTRACT_NAME}
 
-${artifacts}: .hardhat-compile
-
-all: ${gofiles}
-
-.hardhat-compile: node_modules
-	npx hardhat compile --force
-	touch $@
-
-node_modules: package.json
-	npm install
-
-.PHONY: clean clean-smartcontracts clean-node clean-hardhat-artifact 
-clean: clean-hardhat-artifact clean-node clean-smartcontracts
-	rm -f .hardhat-compile
+.PHONY: clean clean-smartcontracts clean-node
+clean: clean-node clean-smartcontracts
 
 clean-smartcontracts:
 	rm -rf build .openzepplin
 
 clean-node:
-	rm -rf node_modules
-
-clean-hardhat-artifact:
-	git clean -fdx artifacts 
-	git clean -fdx cache
-
-type: 
-	npx hardhat typechain
-
-tests: type
-	npx hardhat test test/*.js test/*.ts
+	rm -rf node_modules

smart-contracts/README.md

@@ -0,0 +1,91 @@
+# Unidirectional Peggy Project Specification
+
+This project specification focuses on the role of 'Peggy', a Smart Contract system deployed to the Ethereum network as part of the Ethereum Cosmos Bridge project, and is meant to contextualize its role within the bridge. Specifications detailing structure and process of the non-Ethereum components (Relayer service, EthOracle module, Oracle module) will soon be available in the cosmos-ethereum-bridge repository linked below.
+
+## Project Summary
+
+Unidirectional Peggy is the starting point for cross chain value transfers from the Ethereum blockchain to Cosmos based blockchains as part of the Ethereum Cosmos Bridge project. The smart contract system accepts incoming transfers of Ethereum and ERC20 tokens, locking them while the transaction is validated and equitable funds issued to the intended recipient on the Cosmos bridge chain.
+
+## Project Background
+
+We are hoping to create a closed system for intra network transfers of cryptocurrency between blockchains, spearheaded by a proof-of-concept which enables secured transactions between Ethereum and Cosmos.
+
+## Smart Contract Scope
+
+### Goals of the Smart Contracts
+
+1. Securely implement core functionality of the system such as asset locking and event emission without endangering any user funds. As such, this prototype does not permanently lock value and allows the original sender full access to their funds at any time.
+2. Interface with the Relayer service, which is used by validators to listen for contract events which are signed and submitted to the Cosmos network as proof of transaction.
+3. Successfully end-to-end test the Cosmos Ethereum Bridge, sending Ethereum and ERC20 tokens from Ethereum to Cosmos.
+
+### Non-Goals of the Smart Contracts
+
+1. Creating a production-grade system for cross-chain value transfers which enforces strict permissions and limits access to locked funds.
+2. Implementing a validator set which enables observers to submit proof of fund locking transactions on Cosmos to Peggy. These features are not required for unidirectional transfers from Ethereum to Cosmos and will be re-integrated during phase two of the project, which aims to send funds from Cosmos back to Ethereum.
+3. Fully gas optimize and streamline operational functionality; ease and clarity of testing has been favored over some gas management and architectural best practices.
+
+## Ethereum Cosmos Bridge Architecture
+
+Unidirectional Peggy focuses on core features for unidirectional transfers. This prototype includes functionality to safely lock and unlock Ethereum and ERC20 tokens, emitting associated events which are witnessed by validators using the Relayer service. The Relayer is a service which interfaces with both blockchains, allowing validators to attest on the Cosmos blockchain that specific events on the Ethereum blockchain have occurred. The Relayer listens for `LogLock` events, parses information associated with the Ethereum transaction, uses it to build unsigned Cosmos transactions, and enables validators to sign and send the transactions to the Oracle module on Cosmos. Through the Relayer service, validators witness the events and submit proof in the form of signed hashes to the Cosmos based modules, which are responsible for aggregating and tallying the Validators’ signatures and their respective signing power. The system is managed by the contract's deployer, designated internally as the provider, a trusted third-party which can unlock funds and return them their original sender. If the contract’s balances under threat, the provider can pause the system, temporarily preventing users from depositing additional funds.
+
+The Peggy Smart Contract is deployed on the Ropsten testnet at address: 0x05d9758cb6b9d9761ecb8b2b48be7873efae15c0
+
+### Architecture Diagram
+
+![peggyarchitecturediagram](https://user-images.githubusercontent.com/15370712/58388886-632c7700-7fd9-11e9-962e-4e5e9d92c275.png)
+
+### System Process:
+
+1. Users lock Ethereum or ERC20 tokens on the Peggy contract, resulting in the emission of an event containing the created item's original sender's Ethereum address, the intended recipient's Cosmos address, the type of token, the amount locked, and the item's unique nonce.
+2. Validators on the Cosmos chain witness these lock events via a Relayer service and sign a hash containing the unique item's information, which is sent as a Cosmos transaction to Oracle module.
+3. Once the Oracle module has verified that the validators' aggregated signing power is greater than the specified threshold, it mints the appropriate amount of tokens and forwards them to the intended recipient.
+
+The Relayer service and Oracle module are under development here: https://github.com/cosmos/cosmos-ethereum-bridge.
+
+## Installation
+
+Install Truffle: `$ npm install -g truffle`  
+Install dependencies: `$ npm install`
+
+Note: This project currently uses [email protected], make sure that this version of the Solidity compiler is being used to compile the contracts and does not conflict with other versions that may be installed on your machine.
+
+## Testing
+
+Run commands from the appropriate directory: `$ cd smart-contracts`  
+Start the truffle environment: `$ truffle develop`  
+In another tab, run tests: `$ truffle test --network develop`  
+Run individual tests: `$ truffle test test/<test_name.js>`
+
+Expected output of the test suite:
+![peggytestsuite](https://user-images.githubusercontent.com/15370712/58388940-34fb6700-7fda-11e9-9aef-6ae7b2442a55.png)
+
+### Slither
+
+#### Dependencies
+
+* Python 3.4 or newer
+
+#### Configuration
+
+`slither.config.json` contains various configurations on what severity of issue should be reported and which detectors should be included or excluded. 
+
+`slither.db.json` contains a generated config from `slither . --triage` which lets us excluded false positives. If you generate a new `db.json`, please delete all key/value pairs related to the local computer (/home/{user}/foo/bar) - the file will still. 
+
+#### Run
+
+To run [slither](https://github.com/crytic/slither) over all smart contracts you can run `make slither` in this directory. 
+
+## Security, Privacy, Risks
+
+Disclaimer: These contracts are for testing purposes only and are NOT intended for production. In order to prevent any loss of user funds, locked Ethereum and ERC20 tokens can be withdrawn directly by the original sender at any time. However, these contracts have not undergone external audits and should not be trusted with mainnet funds. Any use of Peggy is at the user’s own risk.
+
+## Other Considerations
+
+We decided to temporarily remove the validator set from this version of the Smart Contracts, our reasoning being that system transparency and clarity should take precedence over the inclusion of future project features. The validator set is not required on Ethereum for unidirectional transfers and will be reimplemented once it is needed in the bidrectional version to validate transactions that have occured on Cosmos.
+
+## Ongoing work
+
+The Ethereum Oracle module and Oracle modules are completed, with the Relayer service currently being actively integrated in order to interface between the smart contracts and Oracles. Once Ethereum -> Cosmos transfers have been successfully prototyped, functionality for bidirectional transfers (such as validator sets, signature validation, and secured token unlocking procedures) will be integrated into the contracts. Previous work in these areas is a valuable resource that will be leveraged once the complete system is ready for bidirectional transfers.
+
+Thanks to @adrianbrink, @mossid, and @sunnya97 for contributions to the original Peggy repository.
+