Merge pull request #6 from datachainlab/improve-protogen

Update solidity-protobuf version

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

Makefile

@@ -1,28 +1,12 @@
-
 ABIGEN ?= abigen
-SOLPB_EXTERNAL_RUNTIME_REPO ?= @hyperledger-labs/yui-ibc-solidity/contracts/proto/
 
 .PHONY: test
 test:
 	go test -v ./pkg/...
 
-# Requirements
-# - setup for solidity-protobuf (https://github.com/datachainlab/solidity-protobuf)
-# - python3
-# - gsed if MacOS user
-.PHONY: solpb
-solpb:
-	SOLPB_EXTERNAL_RUNTIME_REPO=$(SOLPB_EXTERNAL_RUNTIME_REPO) ./scripts/solpb.sh
-
-# run after sol files changed
-.PHONY: setup
-setup:
-	./scripts/setup.sh development
-
-.PHONY: lint-go
-lint-go:
-	go fmt ./pkg/...
-	go vet ./pkg/...
+.PHONY: protogen
+protogen:
+	./scripts/protogen.sh
 
 .PHONY: abi
 abi:

README.md

@@ -36,7 +36,6 @@ interface IContractModule {
 
 ## For Developers
 
-To develop this project, you need the code generator [solidity-protobuf](https://github.com/datachainlab/solidity-protobuf) to generate encoders and decoders in solidity from proto files.
-
-Currently, you need to use [this version](https://github.com/datachainlab/solidity-protobuf/commit/a365f06c140c6ea366d7e72eeea68c9a5b94d390).
+To generate encoders and decoders in solidity from proto files, you need to use the code generator [solidity-protobuf](https://github.com/datachainlab/solidity-protobuf).
 
+Currently, [this version](https://github.com/datachainlab/solidity-protobuf/commit/3def6706178e5407497f3d01b8f0ceb17b32108d) is required.

contracts/core/IContractModule.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.9;
 
 import "./PacketHandler.sol";
-import "./types/Auth.sol";
+import "../proto/cross/core/auth/Auth.sol";
 
 // IContractModule defines the expected interface of a contract module on Cross Framework
 interface IContractModule {

contracts/core/TxAtomicSimple.sol

@@ -8,7 +8,7 @@ import "./PacketHandler.sol";
 import "./ContractRegistry.sol";
 import "./IContractModule.sol";
 import "./IBCKeeper.sol";
-import "./types/AtomicSimple.sol";
+import "../proto/cross/core/atomic/simple/AtomicSimple.sol";
 
 // TxAtomicSimple implements PacketHandler that supports simple-commit protocol
 abstract contract TxAtomicSimple is IBCKeeper, PacketHandler, ContractRegistry {

contracts/core/types/gogoproto/gogo.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.9;
 
 import "../core/IContractModule.sol";
-import "../core/types/Auth.sol";
+import "../proto/cross/core/auth/Auth.sol";
 
 contract MockCrossContract is IContractModule {
     function onContractCall(CrossContext calldata context, bytes calldata callInfo) external override returns (bytes memory) {