Merge pull request #411 from irisnet/feature/implement-erc20-upgrade

feat: implement erc20 upgrade
irisnet · Apr 22, 2024 · aafd2bd · aafd2bd
2 parents 8301452 + 4de9e6f
commit aafd2bd
Show file tree

Hide file tree

Showing 22 changed files with 2,026 additions and 229 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [\#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.
 
 ### Bug Fixes
 

diff --git a/Makefile b/Makefile
@@ -144,6 +144,7 @@ contracts-clean:
 # Compile, filter out and format contracts into the following format.
 create-contracts-abi:
 	solc --combined-json abi,bin --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 --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 --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 --evm-version paris --include-path node_modules --base-path $(CONTRACTS_DIR)/  $(CONTRACTS_DIR)/UpgradeableBeacon.sol | jq '.contracts["UpgradeableBeacon.sol:UpgradeableBeacon"]' > $(COMPILED_DIR)/UpgradeableBeacon.json \
 
 
diff --git a/api/irismod/token/v1/token.pulsar.go b/api/irismod/token/v1/token.pulsar.go