From 63383b590c9d3d47748e31668b5300e8ca682755 Mon Sep 17 00:00:00 2001 From: Vitaliy Potyarkin Date: Tue, 17 Sep 2024 07:31:48 +0000 Subject: [PATCH] Alphabet nodes must be NEO consensus nodes This is required to obtain and distribute genesis tokens --- morph/Makefile | 15 ++++++++++----- morph/protocol.privnet.yml | 3 ++- morph/wallet.template | 3 --- 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 morph/wallet.template diff --git a/morph/Makefile b/morph/Makefile index a51c4b3..cd06a9a 100644 --- a/morph/Makefile +++ b/morph/Makefile @@ -37,21 +37,22 @@ bin/neo-go-v$(NEOGO_VERSION): .PHONY: morph morph: $(WALLET) | $(NEOGO) + grep -F $$($(NEOGO) wallet dump-keys -w $(WALLET)|head -n2|tail -n1) protocol.privnet.yml mkdir -p log $(NEOGO) node --config-path . --privnet --debug 2>&1 | tee --append log/$@ -wallet/morph.json: wallet.template | $(NEOGO) - mkdir -p $(dir $@) - $(NEOGO) wallet init --account --wallet-config $< +wallet/morph.json: wallet/az.json + ln -sf "$(abspath $<)" "$(abspath $@)" $(NEOGO) wallet dump-keys -w $@ .PHONY: bootstrap bootstrap: data/contracts wallet/az.json | $(ADM) $(ADM) morph init --contracts $< --alphabet-wallets wallet --rpc-endpoint http://127.0.0.200:30333 -wallet/az.json: | $(ADM) - mkdir -p wallet +wallet/az.json: | $(ADM) $(NEOGO) + mkdir -p $(dir $@) cd wallet; $(abspath $(ADM)) morph generate-alphabet --size 1 --verbose + $(NEOGO) wallet dump-keys -w $@ data/contracts: | $(NEOGO) mkdir -p $(dir $@) @@ -60,3 +61,7 @@ data/contracts: | $(NEOGO) --depth=1 --single-branch \ $@ $(MAKE) -C $@ all NEOGO=$(abspath $(NEOGO)) + +.PHONY: clean +clean: + git clean -idxff diff --git a/morph/protocol.privnet.yml b/morph/protocol.privnet.yml index 7c7e835..41d420f 100644 --- a/morph/protocol.privnet.yml +++ b/morph/protocol.privnet.yml @@ -4,7 +4,8 @@ ProtocolConfiguration: TimePerBlock: 1s MemPoolSize: 50000 StandbyCommittee: - - 02b3622bf4017b0000000000000000000000000000000000000000000000000000 # nonexistent node + # 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 # frostfs-dev-env node + - 02a6e0de6659670b68b4456a80b7d2ffbcf1c7f2e757533f2751b53497eeb8431c # replace this with node pubkey ValidatorsCount: 1 VerifyTransactions: true StateRootInHeader: true diff --git a/morph/wallet.template b/morph/wallet.template deleted file mode 100644 index ee0cbb9..0000000 --- a/morph/wallet.template +++ /dev/null @@ -1,3 +0,0 @@ ---- -Path: wallet/morph.json -Password: morph