Merge pull request #416 from irisnet/release/v1.8.0-lsm

feat: merge from release/v1.8.0-lsm

.github/workflows/automerge.yml

@@ -26,7 +26,10 @@ jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
-      - name: automerge
-        uses: "pascalgn/[email protected]"
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/[email protected]"
+        permissions:
+          contents: write
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -6,8 +6,9 @@ build/
 .out
 docs/.vuepress/dist/
 node_modules/
-package.json
 yarn.lock
 dependency-graph.png
 mytestnet
 buf-stamp
+artifacts
+.states

CHANGELOG.md

@@ -35,6 +35,33 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## [v1.9.0]
+
+### Improvements
+
+* [\#387](https://github.com/irisnet/irismod/pull/387) Preparatory work for realizing erc20.
+* [\#393](https://github.com/irisnet/irismod/pull/393) Implement DeployERC20 by gov proposal .
+* [\#394](https://github.com/irisnet/irismod/pull/394) Support swap native token from erc20 token.
+* [\#395](https://github.com/irisnet/irismod/pull/395) Implement SwapToERC20.
+* [\#400](https://github.com/irisnet/irismod/pull/400) Implement swap native token from erc20 contract.
+* [\#402](https://github.com/irisnet/irismod/pull/402) Add cli for swap from/to ERC20.
+* [\#404](https://github.com/irisnet/irismod/pull/404) Implement token Balances api.
+* [\#405](https://github.com/irisnet/irismod/pull/405) Rolled back the cosmos-sdk version to v0.47.9.
+* [\#409](https://github.com/irisnet/irismod/pull/409) Add a switch for enabling erc20 swap function.
+* [\#410](https://github.com/irisnet/irismod/pull/410) Implement upgradeable contract.
+* [\#411](https://github.com/irisnet/irismod/pull/411) Implement erc20 upgrade.
+* [\#412](https://github.com/irisnet/irismod/pull/412) Optimize contract code
+* [\#417](https://github.com/irisnet/irismod/pull/417) Optimize token command line
+
+### Bug Fixes
+
+* [\#401](https://github.com/irisnet/irismod/pull/401) Add token test & fix error.
+* [\#407](https://github.com/irisnet/irismod/pull/407) Fix some bugs about erc20 in token module.
+
+### API Breaking Changes
+
+* [\#403](https://github.com/irisnet/irismod/pull/403) Standardized parameter naming
+
 ## [v1.8.0]
 
 ### Improvements

Makefile

@@ -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)
 
@@ -116,7 +116,35 @@ lint: golangci-lint
 format:
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/*/statik.go" -not -path "*.pb.go" | xargs gofmt -w -s
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/*/statik.go" -not -path "*.pb.go" | xargs misspell -w
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/*/statik.go" -not -path "*.pb.go" | xargs goimports -w -local github.com/irisnet/irismod
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/*/statik.go" -not -path "*.pb.go" -not -path "*.pulsar.go" | xargs goimports -w -local github.com/irisnet/irismod
 
 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..."
+	@npm install
+
+# Clean tmp files
+contracts-clean:
+	@rm -rf node_modules
+
+# Compile, filter out and format contracts into the following format.
+create-contracts-abi:
+	solc --combined-json abi,bin --optimize --optimize-runs 200 --evm-version paris --include-path node_modules --base-path $(CONTRACTS_DIR)/  $(CONTRACTS_DIR)/Token.sol | jq '.contracts["Token.sol:Token"]' > $(COMPILED_DIR)/Token.json \
+    && solc --combined-json abi,bin --optimize --optimize-runs 200 --evm-version paris --include-path node_modules --base-path $(CONTRACTS_DIR)/  $(CONTRACTS_DIR)/TokenProxy.sol | jq '.contracts["TokenProxy.sol:TokenProxy"]' > $(COMPILED_DIR)/TokenProxy.json \
+	&& solc --combined-json abi,bin --optimize --optimize-runs 200 --evm-version paris --include-path node_modules --base-path $(CONTRACTS_DIR)/  $(CONTRACTS_DIR)/UpgradeableBeacon.sol | jq '.contracts["UpgradeableBeacon.sol:UpgradeableBeacon"]' > $(COMPILED_DIR)/UpgradeableBeacon.json \
+
+