From e4a341d60c6a017e2ffcc53d0f931be73bc2e4d7 Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Fri, 26 May 2023 17:05:40 +0100 Subject: [PATCH 1/5] wip: pairing --- go.mod | 4 +++- go.sum | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe49c293b..5c23055b6 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,9 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.4 +//replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.4 + +replace github.com/cosmos/cosmos-sdk => ../c-sdk replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index dd32bfc4e..a69a43ef1 100644 --- a/go.sum +++ b/go.sum @@ -230,8 +230,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fetchai/cosmos-sdk v0.18.4 h1:P+pkN3IlDGBpjBXDGMe+gYuNYYkXF85YgWe0wFVFZk4= -github.com/fetchai/cosmos-sdk v0.18.4/go.mod h1:Z5M4TX7PsHNHlF/1XanI2DIpORQ+Q/st7oaeufEjnvU= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= From 478f45cf8c1a975f0f89a74ab615c12aa93339d1 Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Mon, 3 Jul 2023 11:42:44 +0100 Subject: [PATCH 2/5] chore: specify municipal inflations commit Signed-off-by: jonathansumner --- go.mod | 4 +--- go.sum | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5c23055b6..eb28b659a 100644 --- a/go.mod +++ b/go.mod @@ -133,9 +133,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -//replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.4 - -replace github.com/cosmos/cosmos-sdk => ../c-sdk +replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index a69a43ef1..6e9c8c27f 100644 --- a/go.sum +++ b/go.sum @@ -230,6 +230,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f h1:m9PSj1gMyGeolZoa+eW+DSQbJGfaa48yp+ohKnPj9kw= +github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f/go.mod h1:Izf5d8rmo/AO2YFWH6O8jZmK3dCHZcCOLggS7HtjB8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= From ed0ebc7b7140b6cc9a56cf82b8572422844e0788 Mon Sep 17 00:00:00 2001 From: void* Date: Mon, 17 Jul 2023 16:13:13 +0100 Subject: [PATCH 3/5] Dockerfile: Enable aarch64 platform build (#320) --- Dockerfile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b584d41a..2e45906dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM golang:1.18-buster as builder +ARG TARGETARCH + # Set up dependencies ENV PACKAGES jq curl wget jq file make git @@ -12,6 +14,17 @@ COPY . . RUN make install +RUN bash -c '\ +if [[ ${TARGETARCH,,} =~ (arm64|aarch64) ]]; then \ + ARCH=aarch64; \ +elif [[ ${TARGETARCH,,} =~ amd64 ]]; then \ + ARCH=amd64; \ +else \ + echo ">>>>>>>>> ERROR: Unknown target architecture"; \ + exit 1; \ +fi && \ +ln -s /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/api/libwasmvm.${ARCH}.so /usr/lib/libwasmvm.${ARCH}.so' + # ################################## FROM debian:buster as hub @@ -22,7 +35,7 @@ ENV PACKAGES jq curl RUN apt-get update && \ apt-get install -y $PACKAGES -COPY --from=builder /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/api/libwasmvm.x86_64.so /usr/lib/ +COPY --from=builder /usr/lib/libwasmvm.*.so /usr/lib/ COPY --from=builder /go/bin/fetchd /usr/bin/fetchd COPY entrypoints/entrypoint.sh /usr/bin/entrypoint.sh @@ -64,3 +77,4 @@ ENV PYTHONUNBUFFERED=1 ENTRYPOINT [ "/usr/bin/run-localnet-setup.py" ] CMD [] + From 85b85b9911ffed5c84a0a6e374e551fa79b62f72 Mon Sep 17 00:00:00 2001 From: void* Date: Sat, 12 Aug 2023 14:52:31 +0200 Subject: [PATCH 4/5] feat: Municipal Inflation: support in Local Testnet Setup (#328) * chore: update docker-compose.yml config + genesis setup script Signed-off-by: jonathansumner * Adjusting setup for spectrum of municp.inf. from 3% to 100% * Local testnet setup: Optional target adress for municipal infl. --------- Signed-off-by: jonathansumner Co-authored-by: jonathansumner --- docker-compose.yml | 2 ++ entrypoints/run-localnet-setup.py | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 807e1373e..5de9433ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: environment: NUM_VALIDATORS: 3 CHAINID: localnet + # Address bellow generated from mnemonic of node0 using account=0 index=1 in HD path + MUNICIPAL_INFL_TARGET_ADDRESS: fetch12w7ud5hv93zu82as4d64tn00pc596ue2fs74tj volumes: - "setup-data:/setup" diff --git a/entrypoints/run-localnet-setup.py b/entrypoints/run-localnet-setup.py index dc48ea74f..cad6907bb 100755 --- a/entrypoints/run-localnet-setup.py +++ b/entrypoints/run-localnet-setup.py @@ -39,6 +39,8 @@ def get_gentxs(): def main(): + MUNICIPAL_INFL_TARGET_ADDRESS = 'MUNICIPAL_INFL_TARGET_ADDRESS' + for name in ('CHAINID', 'NUM_VALIDATORS'): if name not in os.environ: print('{} environment variable not present'.format(name)) @@ -47,6 +49,7 @@ def main(): # extract the environment variables chain_id = os.environ['CHAINID'] num_validators = int(os.environ['NUM_VALIDATORS']) + municipal_infl_target_address = os.environ.get(MUNICIPAL_INFL_TARGET_ADDRESS, None) # create the initial genesis file if os.path.exists(GENESIS_PATH): @@ -57,6 +60,17 @@ def main(): genesis = json.load(f) genesis["app_state"]["staking"]["params"]["max_validators"] = 10 genesis["app_state"]["staking"]["params"]["max_entries"] = 10 + municipal_infl_genesis_conf = genesis["app_state"]["mint"]["minter"]["municipal_inflation"] + if municipal_infl_target_address: + municipal_infl_genesis_conf.extend([ + {"denom": "nanomobx", "inflation": {"target_address": municipal_infl_target_address, "value": "0.03"}}, + {"denom": "denom005", "inflation": {"target_address": municipal_infl_target_address, "value": "0.05"}}, + {"denom": "denom100", "inflation": {"target_address": municipal_infl_target_address, "value": "1.0"}}, + {"denom": "denom010", "inflation": {"target_address": municipal_infl_target_address, "value": "0.1"}}, + {"denom": "denom050", "inflation": {"target_address": municipal_infl_target_address, "value": "0.5"}}, + {"denom": "denom020", "inflation": {"target_address": municipal_infl_target_address, "value": "0.2"}} + ]) + f.seek(0) json.dump(genesis, f, indent=4) f.truncate() @@ -73,6 +87,18 @@ def main(): validator, '200000000000000000000atestfet'] subprocess.check_call(cmd) + if municipal_infl_target_address: + token_list = ["200000000000000000000atestfet"] + + for infl in municipal_infl_genesis_conf: + token_list.append(f'{10**18}{infl["denom"]}') + tokens = ','.join(token_list) + + cmd = ['fetchd', 'add-genesis-account', + municipal_infl_target_address, tokens] + + subprocess.check_call(cmd) + # copy the generated genesis file shutil.copy(GENESIS_PATH, '/setup/genesis.intermediate.json') From 38289029546130ebdb1f91240ecc59dd418a4189 Mon Sep 17 00:00:00 2001 From: void* Date: Sat, 12 Aug 2023 15:04:44 +0200 Subject: [PATCH 5/5] Update Cosmos-SDK to v0.19.0 (Municipal Inflation release) (#329) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c8645f95..b47596624 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837 +replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.19.0 replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index ae50cc0bd..3e6e2893b 100644 --- a/go.sum +++ b/go.sum @@ -230,8 +230,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837 h1:U8dAdetsb2bJPavS1H1UDty9WNlcDeUSXxPgVWB7JEM= -github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837/go.mod h1:Izf5d8rmo/AO2YFWH6O8jZmK3dCHZcCOLggS7HtjB8c= +github.com/fetchai/cosmos-sdk v0.19.0 h1:CH5J4Zc8fzweHn6B3UNEqSEmWQHuW/LrkglGtLaMprE= +github.com/fetchai/cosmos-sdk v0.19.0/go.mod h1:Izf5d8rmo/AO2YFWH6O8jZmK3dCHZcCOLggS7HtjB8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=