Moonriver erc20

.gitignore

@@ -1,6 +1,28 @@
 .?*
+!.prettierrc
+!.solhint.json
 __pycache__
 **/.DS_Store
 **/*.iml
 build/
-bin/
+bin/
+**/.idea
+**/**/.idea
+**/**/node_modules/
+
+
+/docker-compose/goloop2goloop/config
+/docker-compose/goloop2goloop/data
+/docker-compose/goloop2moonbeam/config
+/docker-compose/goloop2moonbeam/data
+
+.gradle/*
+javascore/bmv/godWallet.json
+**/**/Module/*
+EventDecoder.java
+TypeDecoder.java
+metaData.json
+BMVInitializeData.json
+paraMetaData.json
+relayMetaData.json
+sovereignMetaData.json

Makefile

@@ -52,10 +52,15 @@ $(foreach M,$(CMDS),$(eval $(call CMD_template,$(M))))
 # Build flags for each command
 btpsimple_LDFLAGS = -X 'main.version=$(GL_VERSION)' -X 'main.build=$(BUILD_INFO)'
 BUILD_TARGETS += btpsimple
+BUILD_TARGETS += iconvalidators
 
 linux : $(addsuffix -linux,$(BUILD_TARGETS))
 
-PYSCORE_DIST_DIR = $(BUILD_ROOT)/build/pyscore
+export CONTRACT_DIST_DIR=$(BUILD_ROOT)/build/contracts
+export PYSCORE_DIST_DIR=$(CONTRACT_DIST_DIR)/pyscore
+export JAVASCORE_DIST_DIR=$(CONTRACT_DIST_DIR)/javascore
+export SOLIDITY_DIST_DIR=$(CONTRACT_DIST_DIR)/solidity
+export PYSCORE_TESTNET_DIR=${BUILD_ROOT}/testnet/goloop2goloop/pyscore
 
 $(PYSCORE_DIST_DIR)/%:
 	$(eval MODULE := $(patsubst $(PYSCORE_DIST_DIR)/%,%,$@))
@@ -80,21 +85,29 @@ dist-py-irc2: $(PYSCORE_DIST_DIR)/token_bsh
     zip -r -v $(PYSCORE_DIST_DIR)/irc2_token.zip * -x *__pycache__* -x *tests*
 
 dist-py: dist-py-bmc dist-py-bmv dist-py-irc2
+dist-java: 
+	bash ./scripts/dist_javascore.sh
+dist-sol:
+	bash ./scripts/dist_solidity.sh
 
 clean-dist-py:
 	rm -rf $(PYSCORE_DIST_DIR)/*
+clean-dist-sol:
+	rm -rf $(SOLIDITY_DIST_DIR)
+clean-dist-java:
+	rm -rf $(JAVASCORE_DIST_DIR)
 
 BTPSIMPLE_IMAGE = btpsimple:$(GL_TAG)
 BTPSIMPLE_DOCKER_DIR = $(BUILD_ROOT)/build/btpsimple
 
-btpsimple-image: btpsimple-linux dist-py
+btpsimple-image: btpsimple-linux dist-py dist-java dist-sol
 	@ echo "[#] Building image $(BTPSIMPLE_IMAGE) for $(GL_VERSION)"
 	@ rm -rf $(BTPSIMPLE_DOCKER_DIR)
 	@ \
 	BIN_DIR=$(abspath $(LINUX_BIN_DIR)) \
 	BIN_VERSION=$(GL_VERSION) \
 	BUILD_TAGS="$(GOBUILD_TAGS)" \
-	DIST_DIR="$(PYSCORE_DIST_DIR)" \
+	DIST_DIR="$(CONTRACT_DIST_DIR)" \
 	$(BUILD_ROOT)/docker/btpsimple/build.sh $(BTPSIMPLE_IMAGE) $(BUILD_ROOT) $(BTPSIMPLE_DOCKER_DIR)
 
 .PHONY: test

README.md

@@ -41,7 +41,9 @@ Terminologies
   - Send BTP Relay Message
 
 ### Blockchain specifics
+
 * [ICON](doc/icon.md)
+* [Polkadot parachain with frontier](doc/polkadot_parachain_with_frontier.md)
 
 ## BTP Project
 
@@ -57,12 +59,12 @@ Terminologies
 |:--------------------|:-------|
 | /cmd           |   Root of implement of BMR |
 | /cmd/btpsimple           |   Reference implement of BMR. only provide unidirectional relay. (golang) |
-| /cmd/btpsimple/chain    |   Implement of common logic of BMR, use module |
-| /cmd/btpsimple/module    |   BMR module interface and common codes |
-| /cmd/btpsimple/module/`<chain>`    | Implement of BMR module (`Sender`,`Receiver`), `<chain>` is name of blockchain |
+| /chain/   |   BMR module interface and common codes |
+| /chain/`<chain>`    | Implement of BMR module (`Sender`,`Receiver`), `<chain>` is name of blockchain |
 | /common | Common codes (golang) |
 | /doc | Documents |
 | /docker | Docker related resources |
+| /docker-compose | Setup of local network for running e2e of BTP |
 | /`<env>` | Root of implement of BTP smart contracts, `<env>` is name of smart contract execution environment |
 | /`<env>`/bmc | Implement of BMC smart contract |
 | /`<env>`/bmv | Root of implement of BMV smart contract |
@@ -77,7 +79,10 @@ Terminologies
 #### BMR module
 | Directory                | Description  |
 |:--------------------|:-------|
-| /cmd/btpsimple/module/icon    | BMR module for ICON blockchain |
+| /chain/icon    | BMR module for ICON blockchain |
+| /chain/pra    | BMR module for Polkadot Parachain blockchain |
+| /chain/pra/receiver_relay*    | BMR module to listen for Polkadot Relay blockchain |
+| *_test.go    | BMR files to perform unit test for the *.go file |
 
 #### Python SCORE of ICON
 | Directory                | Description  |
@@ -86,3 +91,30 @@ Terminologies
 | /pyscore/bmv/icon | Implement of BMV smart contract for ICON blockchain |
 | /pyscore/lib | BTP interface and common codes for Python SCORE |
 | /pyscore/lib/icon | ICON related common codes |
+
+#### Java SCORE of ICON
+| Directory                | Description  |
+|:--------------------|:-------|
+| /javascore | Implement of BTP smart contracts for Java SCORE of ICON blockchain |
+| /javascore/bmc | Implement of BMC smart contract |
+| /javascore/bmv/icon | Implement of BMV smart contract for ICON blockchain |
+| /javascore/lib | BTP interface and common codes for Java SCORE |
+
+#### Java SCORE of Parachain
+
+| Directory                | Description  |
+|:--------------------|:-------|
+| /javascore/bmv/parachain | Implement of BMV smart contract for moonbeam parachain |
+| /javascore/bmv/sovereignChain | Implement of BMV smart contract for edgeware parachain |
+| /javascore/bmv/eventDecoder | Implement of event decoder for substrate chain |
+| /javascore/bmv/helper | Script to get parachain initialize parameters and deploy contract |
+| /javascore/lib | BTP interface and common codes for Java SCORE |
+
+#### Solidity of ICON
+
+| Directory                | Description  |
+|:--------------------|:-------|
+| /solidity | Implement of BTP solidity smart contracts of ICON blockchain |
+| /solidity/bmc | Implement of BMC solidity smart contract |
+| /solidity/bmv | Implement of BMV solidity smart contract for ICON blockchain |
+| /solidity/bsh | Implement of BMC solidity smart contract |