From 198bb1b214aebd80b5420c2d364c24665406a3c4 Mon Sep 17 00:00:00 2001 From: Stephen Fluin Date: Tue, 10 Sep 2024 11:27:14 -0500 Subject: [PATCH] feat: remove devnet-verifiers mentions (#1148) --- src/pages/dev/amplifier/add-rewards.mdx | 26 +--- .../chain-integration/integrate-a-chain.mdx | 2 +- .../chain-integration/relay-messages.mdx | 10 +- .../amplifier/governance-proposals.mdx | 12 -- .../amplifier/verifier-onboarding.mdx | 117 +++++++----------- .../validator/amplifier/verifier-rewards.mdx | 29 +---- .../amplifier/verifier-rotations.mdx | 6 +- 7 files changed, 64 insertions(+), 138 deletions(-) diff --git a/src/pages/dev/amplifier/add-rewards.mdx b/src/pages/dev/amplifier/add-rewards.mdx index a210fbc6b..9a13ea081 100644 --- a/src/pages/dev/amplifier/add-rewards.mdx +++ b/src/pages/dev/amplifier/add-rewards.mdx @@ -15,17 +15,7 @@ Reward pools are not tied to an epoch. If earned rewards are not claimed, they w Use `rewards_pool()` to check the funds in a pool: - - - ```bash - export REWARDS_CONTRACT_ADDRESS="axelar1guczj53xxl4347adagh23eelyhnxvugw2nqq0q0dr6kws7q35jyqqnan33" - export CHAIN_NAME="avalanche" - export VOTING_VERIFIER_OR_MULTISIG_CONTRACT_ADDRESS="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" || "0x7eeE33A59Db27d762AA1Fa31b26efeE0dABa1132" - export RPC="http://devnet-verifiers.axelar.dev:26657" - ``` - - - + ```bash export REWARDS_CONTRACT_ADDRESS="axelar1vaj9sfzc3z0gpel90wu4ljutncutv0wuhvvwfsh30rqxq422z89qnd989l" export CHAIN_NAME="fantom" @@ -37,7 +27,7 @@ Use `rewards_pool()` to check the funds in a pool: -You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-verifiers.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-verifiers.json) or [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). +You can get the addresses of the rewards, voting verifier, and multisig contracts through [`testnet.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/testnet.json) or [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). ```bash @@ -61,16 +51,6 @@ Use `add_rewards()` add funds to a pool: - - ```bash - export REWARDS_CONTRACT_ADDRESS="axelar1guczj53xxl4347adagh23eelyhnxvugw2nqq0q0dr6kws7q35jyqqnan33" - export CHAIN_NAME="avalanche" - export VOTING_VERIFIER_OR_MULTISIG_CONTRACT_ADDRESS="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" || "0x7eeE33A59Db27d762AA1Fa31b26efeE0dABa1132" - export RPC="http://devnet-verifiers.axelar.dev:26657" - export AMOUNT="1000uverifiers" # choose the amount to fund (1000000 = 1 AXL) - export CHAIN_ID="devnet-verifiers" - ``` - ```bash @@ -86,7 +66,7 @@ Use `add_rewards()` add funds to a pool: -You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-verifiers.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-verifiers.json) or [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). +You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). ```bash diff --git a/src/pages/dev/amplifier/chain-integration/integrate-a-chain.mdx b/src/pages/dev/amplifier/chain-integration/integrate-a-chain.mdx index 0a10c958d..8263acd6a 100644 --- a/src/pages/dev/amplifier/chain-integration/integrate-a-chain.mdx +++ b/src/pages/dev/amplifier/chain-integration/integrate-a-chain.mdx @@ -212,7 +212,7 @@ You can also deploy a custom implementation of the gateway, verifier, and prover ### Instantiate the voting verifier -1. Instantiate the voting verifier contract on the command line. See the [testnet](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/testnet.json), [devnet-amplifier](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/devnet-amplifier.json), or [devnet-verifiers](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/devnet-verifiers.json) configurations for the correct `code_id`. +1. Instantiate the voting verifier contract on the command line. See the [testnet](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/testnet.json), [devnet-amplifier](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/devnet-amplifier.json) configurations for the correct `code_id`. ```bash export VERIFIER_CODE_ID=626 diff --git a/src/pages/dev/amplifier/chain-integration/relay-messages.mdx b/src/pages/dev/amplifier/chain-integration/relay-messages.mdx index ce8837dc4..f27153127 100644 --- a/src/pages/dev/amplifier/chain-integration/relay-messages.mdx +++ b/src/pages/dev/amplifier/chain-integration/relay-messages.mdx @@ -16,7 +16,7 @@ Chains integrated with Amplifier can [pass GMP messages](/dev/general-message-pa ## Axelar contract deployments -The following code samples illustrate a transaction from Avalanche to Ethereum Sepolia. Information for other chains can be found on [`devnet-verifiers.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/9eb7341088cc0a2fd55e76377cd9b2a14f0989e9/axelar-chains-config/info/devnet-verifiers.json). +The following code samples illustrate a transaction from Avalanche to Ethereum Sepolia. Information for other chains can be found on [`testnet.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/testnet.json). ## Verify messages @@ -31,7 +31,7 @@ export DESTINATION_CHAIN="ethereum-sepolia" export DESTINATION_ADDRESS="0x8f8dedd09E23E22E1555e9D2C25D7c7332291919" export SOURCE_ADDRESS="0x0a3b8dc7706c47b6dd87d771df63875b1c5cd867" export PAYLOAD_HASH="220f68445e3cec114bff50cd6b251e3deabc7684b10280c2116b20bcc6795a96" -export RPC="http://devnet-verifiers.axelar.dev:26657" +export RPC="https://tm.axelar-testnet.lava.build:443" ``` ```bash @@ -53,7 +53,7 @@ axelard tx wasm execute $SOURCE_CHAIN_GATEWAY \ --keyring-backend test \ --from wallet \ --gas auto --gas-adjustment 1.5 --gas-prices 0.007uverifiers \ - --chain-id=devnet-verifiers \ + --chain-id axelar-testnet-lisbon-3 \ --node $RPC ``` @@ -80,7 +80,7 @@ axelard tx wasm execute $SOURCE_CHAIN_GATEWAY \ --keyring-backend test \ --from wallet \ --gas auto --gas-adjustment 1.5 --gas-prices 0.007uverifiers \ - --chain-id=devnet-verifiers \ + --chain-id axelar-testnet-lisbon-3 \ --node $RPC ``` @@ -107,7 +107,7 @@ axelard tx wasm execute $DESTINATION_CHAIN_MULTISIG_PROVER \ --keyring-backend test \ --from wallet \ --gas auto --gas-adjustment 1.5 --gas-prices 0.007uverifiers \ - --chain-id devnet-verifiers \ + --chain-id axelar-testnet-lisbon-3 \ --node $RPC ``` diff --git a/src/pages/validator/amplifier/governance-proposals.mdx b/src/pages/validator/amplifier/governance-proposals.mdx index 3f3fed387..36774d9f0 100644 --- a/src/pages/validator/amplifier/governance-proposals.mdx +++ b/src/pages/validator/amplifier/governance-proposals.mdx @@ -35,18 +35,6 @@ Once the 7 day feedback period has passed, submit the proposal on-chain via the export PROPOSAL_URL="https://community.axelar.network/..." # Your proposal URL ``` - - ```bash - export SERVICE_REGISTRY_ADDRESS="axelar1qk00h5atutpsv900x202pxx42npjr9thg58dnqpa72f2p7m2luas9x8txw" - export VERIFIER_AXELAR_ADDRESS="axelar1ks5em0gmml0qjfek0msqm9pxcmawj54as65j5v" - export NETWORK_GOV_ADDRESS="axelar19vvhwq57656hqfczhxw3r874l29jtd3uns4fsu" - export RPC="http://devnet-verifiers.axelar.dev:26657" - export SERVICE_NAME="validators" - export GAS_PRICE="0.00005uverifiers" - export NAME="My Verifier Name" # Your verifier name - export PROPOSAL_URL="https://community.axelar.network/..." # Your proposal URL - ``` - ```bash diff --git a/src/pages/validator/amplifier/verifier-onboarding.mdx b/src/pages/validator/amplifier/verifier-onboarding.mdx index 96ffeaea4..9887ad94c 100644 --- a/src/pages/validator/amplifier/verifier-onboarding.mdx +++ b/src/pages/validator/amplifier/verifier-onboarding.mdx @@ -209,65 +209,6 @@ This configuration file tells `ampd` how to connect to your local `tofnd`, how t The following are an example `config.toml` files: - - - ```toml - tm_jsonrpc="http://devnet-verifiers.axelar.dev:26657" - tm_grpc="tcp://devnet-verifiers.axelar.dev:9090" - event_buffer_cap=10000 - - [service_registry] - cosmwasm_contract="axelar1qk00h5atutpsv900x202pxx42npjr9thg58dnqpa72f2p7m2luas9x8txw" - - [broadcast] - batch_gas_limit="20000000" - broadcast_interval="1s" - chain_id="devnet-verifiers" - gas_adjustment="2" - gas_price="0.00005uverifiers" - queue_cap="1000" - tx_fetch_interval="1000ms" - tx_fetch_max_retries="15" - - [tofnd_config] - batch_gas_limit="10000000" - key_uid="axelar" - party_uid="ampd" - url="http://127.0.0.1:50051" - - [[handlers]] - cosmwasm_contract="axelar15nczwuqh0zcu6syeqsc4td6dphql7n2p7cgkl9raz97z5s3zdjrsc8we9y" - type="MultisigSigner" - - [[handlers]] - chain_name="ethereum-sepolia" - chain_rpc_url="https://rpc.ankr.com/eth_sepolia" - cosmwasm_contract="axelar1sxujcvele5eqtx0xc4wuy6jr0m28y0yt8spn7efc3527vc2j2xrqk6wkay" - type="EvmMsgVerifier" - chain_finalization="RPCFinalizedBlock" - - [[handlers]] - chain_name="ethereum-sepolia" - chain_rpc_url="https://rpc.ankr.com/eth_sepolia" - cosmwasm_contract="axelar1sxujcvele5eqtx0xc4wuy6jr0m28y0yt8spn7efc3527vc2j2xrqk6wkay" - type="EvmVerifierSetVerifier" - chain_finalization="RPCFinalizedBlock" - - [[handlers]] - chain_name="avalanche" - chain_rpc_url="https://avalanche-fuji-c-chain-rpc.publicnode.com" - cosmwasm_contract="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" - type="EvmMsgVerifier" - chain_finalization="ConfirmationHeight" - - [[handlers]] - chain_name="avalanche" - chain_rpc_url="https://avalanche-fuji-c-chain-rpc.publicnode.com" - cosmwasm_contract="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" - type="EvmVerifierSetVerifier" - chain_finalization="ConfirmationHeight" - ``` - ```toml tm_jsonrpc="http://devnet-amplifier.axelar.dev:26657" @@ -398,6 +339,52 @@ The following are an example `config.toml` files: #type="EvmVerifierSetVerifier" ``` + + ```toml + # replace with your Axelar testnet node + tm_jsonrpc="http://127.0.0.1:26657" + tm_grpc="tcp://127.0.0.1:9090" + event_buffer_cap=100000 + + [service_registry] + cosmwasm_contract="axelar1rpj2jjrv3vpugx9ake9kgk3s2kgwt0y60wtkmcgfml5m3et0mrls6nct9m" + + [broadcast] + batch_gas_limit="20000000" + broadcast_interval="1s" + chain_id="axelar-dojo-1" + gas_adjustment="2" + gas_price="0.007uaxl" + queue_cap="1000" + tx_fetch_interval="1000ms" + tx_fetch_max_retries="15" + + [tofnd_config] + batch_gas_limit="10000000" + key_uid="axelar" + party_uid="ampd" + url="http://127.0.0.1:50051" + + [[handlers]] + cosmwasm_contract="axelar14a4ar5jh7ue4wg28jwsspf23r8k68j7g5d6d3fsttrhp42ajn4xq6zayy5" + type="MultisigSigner" + + # For each supported chain + #[[handlers]] + #chain_name="[chain name]" + #chain_rpc_url="[node rpc url]" + #cosmwasm_contract="[voting verifier address]" + #chain_finalization="[RPCFinalizedBlock or ConfirmationHeight]" + #type="EvmMsgVerifier" + + #[[handlers]] + #chain_name="[chain name]" + #chain_rpc_url="[node rpc url]" + #cosmwasm_contract="[voting verifier address]" + #chain_finalization=["RPCFinalizedBlock" or "ConfirmationHeight"] + #type="EvmVerifierSetVerifier" + ``` + See the [`ampd` README](https://github.com/axelarnetwork/axelar-amplifier/blob/main/ampd/README.md) on GitHub for instructions on formatting a `config` file for your own projects. For `chain_finalization`, if the chain supports the `finalized` tag via the RPC API, choose `RPCFinalizedBlock`, otherwise choose `ConfirmationHeight`. @@ -428,20 +415,14 @@ Prior to running the `ampd` daemon, you will need to set up your wallet with dev 1. Fund your verifier address. - 1. Join the [Axelar Discord](https://discord.com/invite/axelar). - 1. Get the Developer Role. - 1. Go to the [#faucet channel](https://discord.com/channels/770814806105128977/1002423218772136056/1217885883152334918) and submit a request with your account to get 100 test tokens: - - ```bash - !faucet devnet-verifiers [my verifier address] - ``` + 1. Fill out the [Amplifier Verifier Onboarding Form](https://docs.google.com/forms/d/e/1FAIpQLSfQQhk292yT9j8sJF5ARRIE8PpI3LjuFc8rr7xZW7posSLtJA/viewform) for your address to be whitelisted or to receive funds. ## Activate and run the verifier 1. Bond your verifier: ```bash - ampd bond-verifier validators 100 uverifiers + ampd bond-verifier validators 100000000000 uaxl ``` Bonded verifiers will stay bonded until they unbond or are removed by governance. The bond for testnet is 100000000000uaxl (100k AXL). @@ -464,8 +445,6 @@ Prior to running the `ampd` daemon, you will need to set up your wallet with dev This is dependent on the environment, and can be done via governance, or by the network operators. - For devnet, fill out the [Amplifier Verifier Onboarding Form](https://docs.google.com/forms/d/e/1FAIpQLSfQQhk292yT9j8sJF5ARRIE8PpI3LjuFc8rr7xZW7posSLtJA/viewform) for your address to be whitelisted. - 1. Run the `ampd` daemon. Running `ampd` without any command will run the daemon. A state file will be created if it doesn't yet exist. Its default location is `~/.ampd/state.json`, which can be overridden by passing `--state [path]`. diff --git a/src/pages/validator/amplifier/verifier-rewards.mdx b/src/pages/validator/amplifier/verifier-rewards.mdx index ad49fd532..baeec5a2e 100644 --- a/src/pages/validator/amplifier/verifier-rewards.mdx +++ b/src/pages/validator/amplifier/verifier-rewards.mdx @@ -54,17 +54,7 @@ Rewards are calculated through the following parameters, which are first configu Use `rewards_pool()` to check the funds in a pool: - - - ```bash - export REWARDS_CONTRACT_ADDRESS="axelar1guczj53xxl4347adagh23eelyhnxvugw2nqq0q0dr6kws7q35jyqqnan33" - export CHAIN_NAME="avalanche" - export VOTING_VERIFIER_OR_MULTISIG_CONTRACT_ADDRESS="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" # or "axelar1qt0gkcrvcpv765k8ec4tl2svvg6hd3e3td8pvg2fsncrt3dzjefswsq3w2" - export RPC="http://devnet-amplifier.axelar.dev:26657" - ``` - - - + ```bash export REWARDS_CONTRACT_ADDRESS="axelar1vaj9sfzc3z0gpel90wu4ljutncutv0wuhvvwfsh30rqxq422z89qnd989l" export CHAIN_NAME="fantom" @@ -72,7 +62,7 @@ Use `rewards_pool()` to check the funds in a pool: export RPC="http://devnet-amplifier.axelar.dev:26657" ``` - + ```bash export REWARDS_CONTRACT_ADDRESS="axelar1harq5xe68lzl2kx4e5ch4k8840cgqnry567g0fgw7vt2atcuugrqfa7j5z" export CHAIN_NAME="test-avalanche" @@ -80,11 +70,10 @@ Use `rewards_pool()` to check the funds in a pool: export RPC="https://tm.axelar-testnet.lava.build:443" ``` - -You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-verifiers.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-verifiers.json) or [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). +You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). ```bash @@ -107,16 +96,6 @@ axelard q wasm contract-state smart $REWARDS_CONTRACT_ADDRESS \ Use `distribute_rewards()` to distribute rewards from a pool: - - - ```bash - export REWARDS_CONTRACT_ADDRESS="axelar1guczj53xxl4347adagh23eelyhnxvugw2nqq0q0dr6kws7q35jyqqnan33" - export CHAIN_NAME="avalanche" - export VOTING_VERIFIER_OR_MULTISIG_CONTRACT_ADDRESS="axelar1elaymnd2epmfr498h2x9p2nezc4eklv95uv92u9csfs8wl75w7yqdc0h67" || "0x7eeE33A59Db27d762AA1Fa31b26efeE0dABa1132" - export RPC="http://devnet-amplifier.axelar.dev:26657" - ``` - - ```bash export REWARDS_CONTRACT_ADDRESS="axelar1vaj9sfzc3z0gpel90wu4ljutncutv0wuhvvwfsh30rqxq422z89qnd989l" @@ -137,7 +116,7 @@ Use `distribute_rewards()` to distribute rewards from a pool: -You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-verifiers.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-verifiers.json) or [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). +You can get the addresses of the rewards, voting verifier, and multisig contracts through [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/019d41f81b506d35fa89ffd9ebb3a02719563e09/axelar-chains-config/info/devnet-amplifier.json). ```bash diff --git a/src/pages/validator/amplifier/verifier-rotations.mdx b/src/pages/validator/amplifier/verifier-rotations.mdx index 1a903b899..74b4ecc2c 100644 --- a/src/pages/validator/amplifier/verifier-rotations.mdx +++ b/src/pages/validator/amplifier/verifier-rotations.mdx @@ -8,7 +8,7 @@ Use `current_verifier_set` to get the active verifier set for an integrated chai ```bash export CHAIN_MULTISIG_PROVER_ADDRESS="axelar1xz4cya4qm2ws6nzperhvc40wdjcq4872fl6d3j2s4cytyx8j80eqenv87g" -export RPC="http://devnet-verifiers.axelar.dev:26657" +export RPC="https://tm.axelar-testnet.lava.build:443" ``` ```bash @@ -44,7 +44,7 @@ axelard tx wasm execute $CHAIN_MULTISIG_PROVER_ADDRESS \ '"update_verifier_set"' \ --from wallet --gas auto --gas-adjustment 1.5 --gas-prices 0.007uverifiers \ - --chain-id=devnet-verifiers \ + --chain-id axelar-testnet-lisbon-3 \ --node $RPC ``` @@ -58,6 +58,6 @@ axelard tx wasm execute $CHAIN_MULTISIG_PROVER_ADDRESS \ --keyring-backend test --from wallet --gas auto --gas-adjustment 1.5 --gas-prices 0.007uverifiers \ - --chain-id=devnet-verifiers \ + --chain-id axelar-testnet-lisbon-3 \ --node $RPC ``` \ No newline at end of file