From 34af4970f3f10c481fa69530269e041a67a4e532 Mon Sep 17 00:00:00 2001 From: worryFree56 Date: Tue, 23 Aug 2022 16:42:45 +0800 Subject: [PATCH 1/3] testnet and mainnet cosmoswap --- docs/get-started/testnet.md | 18 +++++++++++++++++- docs/pvm/cosmoswap.md | 8 ++++++-- docs/zh/get-started/testnet.md | 15 +++++++++++++++ docs/zh/pvm/cosmoswap.md | 5 ++++- 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/docs/get-started/testnet.md b/docs/get-started/testnet.md index 4a271f3d3..84387f27d 100644 --- a/docs/get-started/testnet.md +++ b/docs/get-started/testnet.md @@ -47,4 +47,20 @@ plugchaind start ## Browser && Faucet - \ No newline at end of file + + + +## cosmoswap + +```js +Router: +bech32: gx14ewpfal7g758zjv0vu9sthcfllagnehh8s28np +eip55: 0xae5C14F7FE47a871498F670B05dF09fffa89e6F7 +Fac: +bech32: gx1anezwnqmssja3phgtz6rjmx5utkry3mptxh0qw +eip55: 0xecf2274c1B8425D886E858b4396cd4E2EC324761 + +WPLUG: +bech32: gx1nqtlcdxd0yq5ydtqv95qguptpzx9cmpa8ga2r5 +eip55: 0x9817fC34CD7901423560616804702b088C5C6C3D +```js \ No newline at end of file diff --git a/docs/pvm/cosmoswap.md b/docs/pvm/cosmoswap.md index 25e4402af..e58961a22 100644 --- a/docs/pvm/cosmoswap.md +++ b/docs/pvm/cosmoswap.md @@ -7,11 +7,15 @@ order: 5 Related contract information: ``` -cosmoSwap pool contract address: +Router: bech32: gx1xulgpeuajthdc52eyqhfpsrf8w3thu97lhguxs eip55: 0x373E80e79d92eEdC5159202e90c0693bA2Bbf0Be -WPLUG contract address: +Factory: +bech32: gx18g7wv6uq6p08mkupr8j2cze8hhhz5twu0ml2cz +eip55: 0x3A3Ce66B80D05E7dDB8119E4ac0b27Bdee2a2dDC + +WPLUG 合约地址: bech32: gx1d2wdkrvdu4y8l9k8pv0hs4cyrc03emtda8zepz eip55: 0x6A9CdB0d8De5487F96C70b1f7857041e1f1CEd6d ``` diff --git a/docs/zh/get-started/testnet.md b/docs/zh/get-started/testnet.md index 638c6c9e4..8c8bec487 100644 --- a/docs/zh/get-started/testnet.md +++ b/docs/zh/get-started/testnet.md @@ -51,3 +51,18 @@ plugchaind start +## cosmoswap 相关信息 + +```js +router路由合约: +bech32: gx14ewpfal7g758zjv0vu9sthcfllagnehh8s28np +eip55: 0xae5C14F7FE47a871498F670B05dF09fffa89e6F7 +fac工厂合约: +bech32: gx1anezwnqmssja3phgtz6rjmx5utkry3mptxh0qw +eip55: 0xecf2274c1B8425D886E858b4396cd4E2EC324761 + + +WPLUG 合约地址: +bech32: gx1nqtlcdxd0yq5ydtqv95qguptpzx9cmpa8ga2r5 +eip55: 0x9817fC34CD7901423560616804702b088C5C6C3D +```js diff --git a/docs/zh/pvm/cosmoswap.md b/docs/zh/pvm/cosmoswap.md index ebad364cd..bc87c313e 100644 --- a/docs/zh/pvm/cosmoswap.md +++ b/docs/zh/pvm/cosmoswap.md @@ -7,10 +7,13 @@ order: 5 相关合约信息: ``` -cosmoSwap 池子合约地址: +Router: bech32: gx1xulgpeuajthdc52eyqhfpsrf8w3thu97lhguxs eip55: 0x373E80e79d92eEdC5159202e90c0693bA2Bbf0Be +Factory: +bech32: gx18g7wv6uq6p08mkupr8j2cze8hhhz5twu0ml2cz +eip55: 0x3A3Ce66B80D05E7dDB8119E4ac0b27Bdee2a2dDC WPLUG 合约地址: bech32: gx1d2wdkrvdu4y8l9k8pv0hs4cyrc03emtda8zepz From 48917454393689719ca9078cc3a5458ba57f1ecf Mon Sep 17 00:00:00 2001 From: worryFree56 Date: Tue, 23 Aug 2022 16:48:02 +0800 Subject: [PATCH 2/3] update testnet --- docs/get-started/testnet.md | 5 +++-- docs/zh/get-started/testnet.md | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/get-started/testnet.md b/docs/get-started/testnet.md index 84387f27d..b5aac2e02 100644 --- a/docs/get-started/testnet.md +++ b/docs/get-started/testnet.md @@ -52,10 +52,11 @@ plugchaind start ## cosmoswap -```js +``` Router: bech32: gx14ewpfal7g758zjv0vu9sthcfllagnehh8s28np eip55: 0xae5C14F7FE47a871498F670B05dF09fffa89e6F7 + Fac: bech32: gx1anezwnqmssja3phgtz6rjmx5utkry3mptxh0qw eip55: 0xecf2274c1B8425D886E858b4396cd4E2EC324761 @@ -63,4 +64,4 @@ eip55: 0xecf2274c1B8425D886E858b4396cd4E2EC324761 WPLUG: bech32: gx1nqtlcdxd0yq5ydtqv95qguptpzx9cmpa8ga2r5 eip55: 0x9817fC34CD7901423560616804702b088C5C6C3D -```js \ No newline at end of file +``` \ No newline at end of file diff --git a/docs/zh/get-started/testnet.md b/docs/zh/get-started/testnet.md index 8c8bec487..9b61c542d 100644 --- a/docs/zh/get-started/testnet.md +++ b/docs/zh/get-started/testnet.md @@ -53,16 +53,16 @@ plugchaind start ## cosmoswap 相关信息 -```js +``` router路由合约: bech32: gx14ewpfal7g758zjv0vu9sthcfllagnehh8s28np eip55: 0xae5C14F7FE47a871498F670B05dF09fffa89e6F7 + fac工厂合约: bech32: gx1anezwnqmssja3phgtz6rjmx5utkry3mptxh0qw eip55: 0xecf2274c1B8425D886E858b4396cd4E2EC324761 - WPLUG 合约地址: bech32: gx1nqtlcdxd0yq5ydtqv95qguptpzx9cmpa8ga2r5 eip55: 0x9817fC34CD7901423560616804702b088C5C6C3D -```js +``` From d36f3d27af52f56da7d73be874644dcff7877d1b Mon Sep 17 00:00:00 2001 From: worryFree56 Date: Thu, 25 Aug 2022 15:51:18 +0800 Subject: [PATCH 3/3] release --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ab319b4aa..6e9b2c701 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,7 @@ proto-swagger-gen: ### Releasing ### ############################################################################### PACKAGE_NAME:=github.com/oracleNetworkProtocol/plugchain -GOLANG_CROSS_VERSION = v1.18 +GOLANG_CROSS_VERSION = v1.17.1 GOPATH ?= '$(HOME)/go' release-dry-run: docker run \ @@ -308,7 +308,7 @@ release-dry-run: -v `pwd`:/go/src/$(PACKAGE_NAME) \ -v ${GOPATH}/pkg:/go/pkg \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ --rm-dist --skip-validate --snapshot release: @@ -324,7 +324,7 @@ release: -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ release --rm-dist --skip-validate .PHONY: release-dry-run release \ No newline at end of file