diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 72f238fcc..9c116ae27 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -37,7 +37,7 @@ In case this PR includes changes that must be applied only to a subset of nodes, - [ ] I have added tests to CI - [ ] I have tested this code manually on local environment - [ ] I have tested this code manually on remote devnet using express-cli -- [ ] I have tested this code manually on mumbai +- [ ] I have tested this code manually on mumbai or amoy - [ ] I have created new e2e tests into express-cli ### Manual tests diff --git a/.github/workflows/packager.yml b/.github/workflows/packager.yml index d1683af1b..f2049ce8a 100644 --- a/.github/workflows/packager.yml +++ b/.github/workflows/packager.yml @@ -90,6 +90,37 @@ jobs: NODE: sentry NETWORK: mumbai + - name: Setting up heimdalld for for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: amd64 + NODE: sentry + NETWORK: amoy + - name: Copying over the postinst file for for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/postinst.profile.amoy packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst + env: + ARCH: amd64 + NODE: sentry + NETWORK: amoy + - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/systemd/heimdalld-amoy-sentry.service packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service + env: + ARCH: amd64 + NODE: sentry + NETWORK: amoy + - name: Copying profile control file for for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.profile.amd64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: amd64 + NODE: sentry + NETWORK: amoy + - name: Building heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile + run: dpkg-deb --build --root-owner-group packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: amd64 + NODE: sentry + NETWORK: amoy + - name: Setting up heimdalld for for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} env: @@ -158,6 +189,43 @@ jobs: NODE: validator NETWORK: mumbai + - name: Setting heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Prepping control file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.validator packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Prepping postinst file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/postinst.profile.amoy packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/systemd/heimdalld-amoy-validator.service packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Copying profile control file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.profile.amd64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Building heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile + run: dpkg-deb --build --root-owner-group packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: amd64 + NODE: validator + NETWORK: amoy + - name: Setting up heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} env: @@ -278,6 +346,37 @@ jobs: NODE: validator NETWORK: mumbai + - name: Setting heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: arm64 + NODE: validator + NETWORK: amoy + - name: Copying over the postinst file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/postinst.profile.amoy packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN//postinst + env: + ARCH: arm64 + NODE: validator + NETWORK: amoy + - name: Copying arm64 control file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.validator.arm64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: arm64 + NODE: validator + NETWORK: amoy + - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/systemd/heimdalld-amoy-validator.service packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service + env: + ARCH: arm64 + NODE: validator + NETWORK: amoy + - name: Building heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile + run: dpkg-deb --build --root-owner-group packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: arm64 + NODE: validator + NETWORK: amoy + - name: Setting up heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} env: @@ -352,6 +451,43 @@ jobs: NODE: sentry NETWORK: mumbai + - name: Setting up heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Copying control for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.arm64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Copying postinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/postinst.arm64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/systemd/heimdalld-amoy-sentry.service packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Copying arm64 control file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} + run: cp -rp packaging/templates/package_scripts/control.profile.arm64 packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/control + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Building heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile + run: dpkg-deb --build --root-owner-group packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} + env: + ARCH: arm64 + NODE: sentry + NETWORK: amoy + - name: Setting up heimdalld for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} run: cp -rp packaging/deb/heimdalld packaging/deb/heimdalld-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }} env: diff --git a/README.md b/README.md index 5850db708..e638df446 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ $ make install $ heimdalld init $ heimdalld init --chain=mainnet Will init with genesis.json for mainnet $ heimdalld init --chain=mumbai Will init with genesis.json for mumbai +$ heimdalld init --chain=amoy Will init with genesis.json for amoy ``` ### Run-heimdall ```bash @@ -28,6 +29,7 @@ $ heimdalld start $ heimdalld start Will start for mainnet by default $ heimdalld start --chain=mainnet Will start for mainnet $ heimdalld start --chain=mumbai Will start for mumbai +$ heimdalld start --chain=amoy Will start for amoy $ heimdalld start --chain=local Will start for local with NewSelectionAlgoHeight = 0 ``` diff --git a/cmd/heimdalld/service/service.go b/cmd/heimdalld/service/service.go index 3fe70f48d..6a23ca6d2 100644 --- a/cmd/heimdalld/service/service.go +++ b/cmd/heimdalld/service/service.go @@ -402,7 +402,7 @@ func startInProcess(cmd *cobra.Command, shutdownCtx context.Context, ctx *server // initialize heimdall if needed (do not force!) initConfig := &initHeimdallConfig{ - chainID: "", // chain id should be auto generated if chain flag is not set to mumbai or mainnet + chainID: "", // chain id should be auto generated if chain flag is not set to mumbai, amoy or mainnet chain: viper.GetString(helper.ChainFlag), validatorID: 1, // default id for validator clientHome: viper.GetString(helper.FlagClientHome), diff --git a/helper/allocs/amoy.json b/helper/allocs/amoy.json new file mode 100644 index 000000000..48b4b3f6e --- /dev/null +++ b/helper/allocs/amoy.json @@ -0,0 +1,251 @@ +{ + "genesis_time": "2023-11-06T06:41:35.410487141Z", + "chain_id": "heimdall-80002", + "consensus_params": { + "block": { + "max_bytes": "22020096", + "max_gas": "-1", + "time_iota_ms": "1000" + }, + "evidence": { + "max_age": "100000" + }, + "validator": { + "pub_key_types": [ + "secp256k1" + ] + } + }, + "app_hash": "", + "app_state": { + "auth": { + "params": { + "max_memo_characters": "256", + "tx_sig_limit": "7", + "tx_size_cost_per_byte": "10", + "sig_verify_cost_ed25519": "590", + "sig_verify_cost_secp256k1": "1000", + "max_tx_gas": "1000000", + "tx_fees": "1000000000000000" + }, + "accounts": [ + { + "address": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "coins": [ + { + "denom": "matic", + "amount": "1000000000000000000" + } + ], + "sequence_number": "0", + "account_number": "0", + "module_name": "", + "module_permissions": null + } + ] + }, + "bank": { + "send_enabled": true + }, + "bor": { + "params": { + "sprint_duration": "16", + "span_duration": "6400", + "producer_count": "11" + }, + "spans": [ + { + "span_id": "0", + "start_block": "0", + "end_block": "255", + "validator_set": { + "validators": [ + { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + ], + "proposer": { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + }, + "selected_producers": [ + { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + ], + "bor_chain_id": "80002" + } + ] + }, + "chainmanager": { + "params": { + "mainchain_tx_confirmations": "6", + "maticchain_tx_confirmations": "10", + "chain_params": { + "bor_chain_id": "80002", + "matic_token_address": "0x3fd0A53F4Bf853985a95F4Eb3F9C9FDE1F8e2b53", + "staking_manager_address": "0x4AE8f648B1Ec892B6cc68C89cc088583964d08bE", + "slash_manager_address": "0x9e699267858ce513eACF3b66420334785f9c8E4c", + "root_chain_address": "0xbd07D7E1E93c8d4b2a261327F3C28a8EA7167209", + "staking_info_address": "0x5E3111a5d928D24718c1A7897261D0B9087002ed", + "state_sender_address": "0x49E307Fa5a58ff1834E0F8a60eB2a9609E6A5F50", + "state_receiver_address": "0x0000000000000000000000000000000000001001", + "validator_set_address": "0x0000000000000000000000000000000000001000" + } + } + }, + "checkpoint": { + "params": { + "checkpoint_buffer_time": "1000000000000", + "avg_checkpoint_length": "256", + "max_checkpoint_length": "1024", + "child_chain_block_interval": "10000" + }, + "buffered_checkpoint": null, + "last_no_ack": "0", + "ack_count": "0", + "checkpoints": null + }, + "clerk": { + "event_records": [], + "record_sequences": null + }, + "gov": { + "starting_proposal_id": "1", + "deposits": null, + "votes": null, + "proposals": null, + "deposit_params": { + "min_deposit": [ + { + "denom": "matic", + "amount": "10000000000000000000" + } + ], + "max_deposit_period": "172800000000000" + }, + "voting_params": { + "voting_period": "172800000000000" + }, + "tally_params": { + "quorum": "0.334000000000000000", + "threshold": "0.500000000000000000", + "veto": "0.334000000000000000" + } + }, + "params": null, + "sidechannel": { + "past_commits": [] + }, + "slashing": { + "params": { + "signed_blocks_window": "100", + "min_signed_per_window": "0.500000000000000000", + "downtime_jail_duration": "600000000000", + "slash_fraction_double_sign": "0.050000000000000000", + "slash_fraction_downtime": "0.010000000000000000", + "slash_fraction_limit": "0.333333333333333333", + "jail_fraction_limit": "0.333333333333333333", + "max_evidence_age": "120000000000", + "enable_slashing": false + }, + "signing_infos": { + "1": { + "valID": "1", + "startHeight": "0", + "indexOffset": "0" + } + }, + "missed_blocks": {}, + "buffer_val_slash_info": null, + "tick_val_slash_info": null, + "tick_count": "0" + }, + "staking": { + "validators": [ + { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + ], + "current_val_set": { + "validators": [ + { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + ], + "proposer": { + "ID": "1", + "startEpoch": "0", + "endEpoch": "0", + "nonce": "1", + "power": "10000", + "pubKey": "0x04dc19fdf9a82fd5c4327f31b96b6bbe0b9d44564ad89c2139db47c5cb2def87ac584fc05117663de2f17ae5ee50eced7283a596e10aaf33fb34c4cf5f98e4fda7", + "signer": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "last_updated": "", + "jailed": false, + "accum": "0" + } + }, + "staking_sequences": null + }, + "supply": { + "supply": { + "total": [] + } + }, + "topup": { + "tx_sequences": null, + "dividend_accounts": [ + { + "user": "0x6ab3d36c46ecfb9b9c0bd51cb1c3da5a2c81cea6", + "feeAmount": "0" + } + ] + } + } +} diff --git a/helper/config.go b/helper/config.go index 99932b765..bc07b6ed0 100644 --- a/helper/config.go +++ b/helper/config.go @@ -42,6 +42,7 @@ const ( MainChain = "mainnet" MumbaiChain = "mumbai" + AmoyChain = "amoy" LocalChain = "local" // heimdall-config flags @@ -121,7 +122,9 @@ const ( DefaultMainnetSeeds = "1500161dd491b67fb1ac81868952be49e2509c9f@52.78.36.216:26656,dd4a3f1750af5765266231b9d8ac764599921736@3.36.224.80:26656,8ea4f592ad6cc38d7532aff418d1fb97052463af@34.240.245.39:26656,e772e1fb8c3492a9570a377a5eafdb1dc53cd778@54.194.245.5:26656" - DefaultTestnetSeeds = "9df7ae4bf9b996c0e3436ed4cd3050dbc5742a28@43.200.206.40:26656,d9275750bc877b0276c374307f0fd7eae1d71e35@54.216.248.9:26656,1a3258eb2b69b235d4749cf9266a94567d6c0199@52.214.83.78:26656" + DefaultMumbaiTestnetSeeds = "9df7ae4bf9b996c0e3436ed4cd3050dbc5742a28@43.200.206.40:26656,d9275750bc877b0276c374307f0fd7eae1d71e35@54.216.248.9:26656,1a3258eb2b69b235d4749cf9266a94567d6c0199@52.214.83.78:26656" + + DefaultAmoyTestnetSeeds = "eb57fffe96d74312963ced94a94cbaf8e0d8ec2e@54.217.171.196:26656,080dcdffcc453367684b61d8f3ce032f357b0f73@13.251.184.185:26656" secretFilePerm = 0600 @@ -244,6 +247,7 @@ type ChainManagerAddressMigration struct { var chainManagerAddressMigrations = map[string]map[int64]ChainManagerAddressMigration{ MainChain: {}, MumbaiChain: {}, + AmoyChain: {}, "default": {}, } @@ -402,6 +406,11 @@ func InitHeimdallConfigWith(homeDir string, heimdallConfigFileFromFLag string) { spanOverrideHeight = 10205000 newHexToStringAlgoHeight = 12048023 aalborgHeight = 18035772 + case AmoyChain: + newSelectionAlgoHeight = 0 + spanOverrideHeight = 0 + newHexToStringAlgoHeight = 0 + aalborgHeight = 0 default: newSelectionAlgoHeight = 0 spanOverrideHeight = 0 @@ -513,7 +522,7 @@ func GetAddress() []byte { // GetValidChains returns all the valid chains func GetValidChains() []string { - return []string{"mainnet", "mumbai", "local"} + return []string{"mainnet", "mumbai", "amoy", "local"} } // GetNewSelectionAlgoHeight returns newSelectionAlgoHeight @@ -960,7 +969,9 @@ func UpdateTendermintConfig(tendermintConfig *cfg.Config, v *viper.Viper) { case MainChain: tendermintConfig.P2P.Seeds = DefaultMainnetSeeds case MumbaiChain: - tendermintConfig.P2P.Seeds = DefaultTestnetSeeds + tendermintConfig.P2P.Seeds = DefaultMumbaiTestnetSeeds + case AmoyChain: + tendermintConfig.P2P.Seeds = DefaultAmoyTestnetSeeds } } } diff --git a/helper/config_test.go b/helper/config_test.go index 3cb9f1cea..f99259262 100644 --- a/helper/config_test.go +++ b/helper/config_test.go @@ -105,7 +105,8 @@ func TestHeimdallConfigUpdateTendermintConfig(t *testing.T) { {chain: "mumbai", viper: "viper", def: "default", value: "viper"}, {chain: "mumbai", viper: "viper", def: "", value: "viper"}, {chain: "mumbai", viper: "", def: "default", value: "default"}, - {chain: "mumbai", viper: "", def: "", value: DefaultTestnetSeeds}, + {chain: "mumbai", viper: "", def: "", value: DefaultMumbaiTestnetSeeds}, + {chain: "amoy", viper: "", def: "", value: DefaultAmoyTestnetSeeds}, {chain: "mainnet", viper: "viper", def: "default", value: "viper"}, {chain: "mainnet", viper: "viper", def: "", value: "viper"}, {chain: "mainnet", viper: "", def: "default", value: "default"}, diff --git a/helper/genesis_file.go b/helper/genesis_file.go index 0644f5df2..d10ca86b9 100644 --- a/helper/genesis_file.go +++ b/helper/genesis_file.go @@ -15,7 +15,7 @@ var allocs embed.FS func WriteGenesisFile(chain string, filePath string, cdc *codec.Codec) (bool, error) { switch chain { - case "mumbai", "mainnet": + case "amoy", "mumbai", "mainnet": fn := fmt.Sprintf("allocs/%s.json", chain) genDoc, err := readPrealloc(fn, cdc) diff --git a/helper/tx.go b/helper/tx.go index 6e27bed13..3e17c32ea 100644 --- a/helper/tx.go +++ b/helper/tx.go @@ -56,8 +56,7 @@ func GenerateAuthObj(client *ethclient.Client, address common.Address, data []by return } - // fetch nonce - nonce, err := client.PendingNonceAt(context.Background(), fromAddress) + nonce, err := client.NonceAt(context.Background(), fromAddress, nil) if err != nil { return } diff --git a/packaging/deb/heimdalld/DEBIAN/control b/packaging/deb/heimdalld/DEBIAN/control index 5787d5e43..69fa8931c 100644 --- a/packaging/deb/heimdalld/DEBIAN/control +++ b/packaging/deb/heimdalld/DEBIAN/control @@ -3,11 +3,11 @@ Section: develop Priority: Testing Maintainer: Polygon Build-Depends: debhelper-compat (= 13) -Standards-Version: v1.0.3 +Standards-Version: v1.0.3-amoy-2 Homepage: https://polygon.technology Rules-Requires-Root: no Package: heimdalld -Version: 1.0.3 +Version: 1.0.3-amoy-2 Architecture: amd64 Multi-Arch: foreign Depends: diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 7d9bdc272..56f067454 100755 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: heimdalld -Version: 1.0.3 +Version: 1.0.3-amoy-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 0283e42a6..7eae2b982 100755 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: heimdalld -Version: 1.0.3 +Version: 1.0.3-amoy-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index d295328d7..aff6b52be 100755 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: heimdalld-profile -Version: 1.0.3 +Version: 1.0.3-amoy-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 19b3722fd..5fbe4d0e1 100755 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: heimdalld-profile -Version: 1.0.3 +Version: 1.0.3-amoy-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 89b4a8de5..ad5acdb92 100755 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -3,11 +3,11 @@ Section: develop Priority: Testing Maintainer: Polygon Build-Depends: debhelper-compat (= 13) -Standards-Version: v1.0.3 +Standards-Version: v1.0.3-amoy-2 Homepage: https://polygon.technology Rules-Requires-Root: no Package: heimdalld-profile -Version: 1.0.3 +Version: 1.0.3-amoy-2 Architecture: amd64 Multi-Arch: foreign Depends: rabbitmq-server diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 88fac3db0..94377dab8 100755 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -3,11 +3,11 @@ Section: develop Priority: Testing Maintainer: Polygon Build-Depends: debhelper-compat (= 13) -Standards-Version: v1.0.3 +Standards-Version: v1.0.3-amoy-2 Homepage: https://polygon.technology Rules-Requires-Root: no Package: heimdalld-profile -Version: 1.0.3 +Version: 1.0.3-amoy-2 Architecture: arm64 Multi-Arch: foreign Depends: rabbitmq-server diff --git a/packaging/templates/package_scripts/postinst.profile.amoy b/packaging/templates/package_scripts/postinst.profile.amoy new file mode 100755 index 000000000..d4c29a88e --- /dev/null +++ b/packaging/templates/package_scripts/postinst.profile.amoy @@ -0,0 +1,5 @@ +#!/bin/bash +# This is a postinstallation script so the service can be configured and started when requested +# +sudo -u heimdall heimdalld init --chain=amoy --home /var/lib/heimdall +sudo systemctl daemon-reload diff --git a/packaging/templates/systemd/heimdalld-amoy-sentry.service b/packaging/templates/systemd/heimdalld-amoy-sentry.service new file mode 100644 index 000000000..e9c1f06d7 --- /dev/null +++ b/packaging/templates/systemd/heimdalld-amoy-sentry.service @@ -0,0 +1,16 @@ +[Unit] + Description=heimdalld + StartLimitIntervalSec=500 + StartLimitBurst=5 +[Service] + Restart=on-failure + RestartSec=5s + WorkingDirectory=/usr/bin + ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \ + --chain=amoy \ + --rest-server + Type=simple + LimitNOFILE=65536 + User=heimdall +[Install] + WantedBy=multi-user.target diff --git a/packaging/templates/systemd/heimdalld-amoy-validator.service b/packaging/templates/systemd/heimdalld-amoy-validator.service new file mode 100644 index 000000000..078393036 --- /dev/null +++ b/packaging/templates/systemd/heimdalld-amoy-validator.service @@ -0,0 +1,17 @@ +[Unit] + Description=heimdalld + StartLimitIntervalSec=500 + StartLimitBurst=5 +[Service] + Restart=on-failure + RestartSec=5s + WorkingDirectory=/usr/bin + ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \ + --bridge --all \ + --chain=amoy \ + --rest-server + Type=simple + LimitNOFILE=65536 + User=heimdall +[Install] + WantedBy=multi-user.target