Skip to content

Commit

Permalink
Merge pull request #387 from irisnet/feature/define-erc20
Browse files Browse the repository at this point in the history
feat: preparatory work for realizing erc20
  • Loading branch information
scott-irisnet authored Apr 13, 2024
2 parents 718d99d + d68dc71 commit 7440c31
Show file tree
Hide file tree
Showing 38 changed files with 10,085 additions and 710 deletions.
28 changes: 27 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ distclean: clean
### Protobuf ###
###############################################################################

protoVer=0.11.2
protoVer=0.13.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand Down Expand Up @@ -120,3 +120,29 @@ format:

benchmark:
@go test -mod=readonly -bench=. ./...

###############################################################################
### Compile Solidity Contracts ###
###############################################################################

CONTRACTS_DIR := contracts
COMPILED_DIR := $(CONTRACTS_DIR)/compiled_contracts

# Compile and format solidity contracts for the erc20 module. Also install
# openzeppeling as the contracts are build on top of openzeppelin templates.
contracts-compile: contracts-clean dep-install create-contracts-abi

# Install openzeppelin solidity contracts
dep-install:
@echo "Importing openzeppelin contracts..."
@cd $(CONTRACTS_DIR) && \
npm install

# Clean tmp files
contracts-clean:
@rm -rf $(CONTRACTS_DIR)/node_modules

# Compile, filter out and format contracts into the following format.
create-contracts-abi:
solc --combined-json abi,bin --evm-version paris --include-path $(CONTRACTS_DIR)/node_modules --base-path ./contracts ./contracts/Token.sol | jq '.contracts["Token.sol:Token"]' > $(COMPILED_DIR)/Token.json

26 changes: 13 additions & 13 deletions api/irismod/coinswap/coinswap.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions api/irismod/coinswap/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions api/irismod/farm/farm.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions api/irismod/farm/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions api/irismod/htlc/htlc.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions api/irismod/htlc/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions api/irismod/mt/mt.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7440c31

Please sign in to comment.