Skip to content

Commit

Permalink
feat: update to ampd 1.2 and axelard 1.0.4 (#1193)
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenFluin authored Oct 10, 2024
1 parent 5e17455 commit ee28a0b
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 111 deletions.
5 changes: 5 additions & 0 deletions src/config/variables.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const AXELARD = "1.0.4";
export const AXELARD_TESTNET = "1.0.4";
export const AMPD = "1.2.0";
export const TOFND = "1.0.1";
export const TOFND_TESTNET = "1.0.1";
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Integrate a Chain

import { Callout } from "/src/components/callout"
import { Callout } from "/src/components/callout";
import { AXELARD, AMPD } from '/src/config/variables';


<Callout>
The Axelar Virtual Machine (AVM) and Amplifier are currently under active development, so these instructions are likely to change. Please check back frequently for updates.
Expand All @@ -19,28 +21,24 @@ The Axelar Virtual Machine (AVM) and Amplifier are currently under active develo
- Connected chains and contracts: [`devnet-amplifier.json`](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/devnet-amplifier.json)

## Get the `axelard` binary

Install the `v1.0.2 axelard` binary. You can either download the pre-built version or build it yourself from `axelar-core`.
Install the v{AXELARD} `axelard` binary. You can either download the pre-built version or build it yourself from `axelar-core`.

<tabs>

<tab-item title="Download">
To use the pre-built `axelard` binary:

1. Download the pre-built [`axelard` binary](https://github.com/axelarnetwork/axelar-core/releases/tag/v1.0.2) along with the latest version of the [`WasmVM`](https://github.com/CosmWasm/wasmvm/releases/tag/v1.3.1).
- Intel Macs: [`axelard-darwin-amd64-v1.0.2`](https://github.com/axelarnetwork/axelar-core/releases/download/v1.0.2/axelard-darwin-amd64-v1.0.2) and [`libwasmvm.dylib`](https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm.dylib)
- [Macs with Apple silicon](https://support.apple.com/en-us/116943): [`axelard-darwin-arm64-v1.0.2`](https://github.com/axelarnetwork/axelar-core/releases/download/v1.0.2/axelard-darwin-arm64-v1.0.2) and [`libwasmvm.dylib`](https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm.dylib)
- Linux: [`axelard-linux-amd64-v1.0.2`](https://github.com/axelarnetwork/axelar-core/releases/download/v1.0.2/axelard-linux-amd64-v1.0.2) and [`libwasmvm.x86_64.so`](https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm.x86_64.so)
1. Download the pre-built [`axelard` binary](https://github.com/axelarnetwork/axelar-core/releases/tag/latest) along with the latest version of the [`WasmVM`](https://github.com/CosmWasm/wasmvm/releases/tag/v1.3.1).

1. Add the folder containing the library to `LD_LIBRARY_PATH`:

```bash
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:~/[your-path]
ln -s axelard-darwin-arm64-v1.0.2 axelard
chmod a+x axelard-darwin-arm64-v1.0.2
ln -s axelard-darwin-arm64-v* axelard
chmod a+x axelard-darwin-arm64-v*
```

If you run into a Mac warning telling you that either the `axelard` binary or the `WasmVM` cannot be verified, you can disable it by running:
If you run into a Mac warning telling you that either the `axelard` binary or the `WasmVM` cannot be verified, you can disable the warning by running:


```bash
Expand All @@ -52,7 +50,7 @@ To use the pre-built `axelard` binary:
To build the `axelard` binary from source:

1. Clone the [`axelar-core` repo](https://github.com/axelarnetwork/axelar-core).
1. Checkout the `v1.0.2` release tag.
1. Checkout the v{AXELARD} release tag.
1. Run `make build`.
</tab-item>

Expand Down Expand Up @@ -101,7 +99,7 @@ Use the existing deployments for all three contracts, making note of the existin
```bash
git clone https://github.com/axelarnetwork/axelar-amplifier
cd axelar-amplifier
git checkout ampd-v1.0.0
git checkout ampd-v1.2.0
```
1. Build the `gateway`, `voting verifier`, and `multisig prover` contracts from using the [CosmWasm `rust-optimizer`](https://github.com/CosmWasm/optimizer). From the root of the repo, run:
Expand Down
19 changes: 10 additions & 9 deletions src/content/docs/resources/contract-addresses/mainnet.mdx
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Mainnet

import { Callout } from '/src/components/callout'
import { Callout } from '/src/components/callout';

import IBCChannels from '/src/components/ibc/channels'
import TransferFeeCalculator from '/src/components/transfer-fee/calculator'
import EVMChains from '/src/components/evm/chains'
import EVMAssets from '/src/components/evm/assets'
import UpgradePath from '/src/upgrade-path.md'
import IBCChannels from '/src/components/ibc/channels';
import TransferFeeCalculator from '/src/components/transfer-fee/calculator';
import EVMChains from '/src/components/evm/chains';
import EVMAssets from '/src/components/evm/assets';
import UpgradePath from '/src/upgrade-path.md';
import { AXELARD, TOFND } from '/src/config/variables';

| Variable | Value |
| --------------------- | --------- |
| `chain-id` | `axelar-dojo-1` |
| `axelar-core` version | `v1.0.2` |
| `vald` version | `v1.0.2` |
| `tofnd` version | `v1.0.1` |
| `axelar-core` version | {AXELARD} |
| `vald` version | {AXELARD} |
| `tofnd` version | {TOFND} |

## EVM contract addresses

Expand Down
19 changes: 10 additions & 9 deletions src/content/docs/resources/contract-addresses/testnet.mdx
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
# Testnet

import { Callout } from '/src/components/callout'
import IBCChannels from '/src/components/ibc/channels'
import TransferFeeCalculator from '/src/components/transfer-fee/calculator'
import EVMChains from '/src/components/evm/chains'
import EVMAssets from '/src/components/evm/assets'
import UpgradePathTestnet from '/src/upgrade-path-testnet.md'
import { Callout } from '/src/components/callout';
import IBCChannels from '/src/components/ibc/channels';
import TransferFeeCalculator from '/src/components/transfer-fee/calculator';
import EVMChains from '/src/components/evm/chains';
import EVMAssets from '/src/components/evm/assets';
import UpgradePathTestnet from '/src/upgrade-path-testnet.md';
import { AXELARD_TESTNET, TOFND_TESTNET } from '/src/config/variables';

| Variable | Value |
| --------------------- | --------- |
| `chain-id` | `axelar-testnet-lisbon-3` |
| `axelar-core` version | `v1.0.2` |
| `vald` version | `v1.0.2` |
| `tofnd` version | `v1.0.1` |
| `axelar-core` version | v{AXELARD_TESTNET} |
| `vald` version | v{AXELARD_TESTNET} |
| `tofnd` version | v{TOFND_TESTNET} |
| amplifier contracts | see [testnet.json](https://github.com/axelarnetwork/axelar-contract-deployments/blob/main/axelar-chains-config/info/testnet.json) |

## EVM contract addresses
Expand Down
17 changes: 9 additions & 8 deletions src/content/docs/resources/mainnet/upgrades/v1.mdx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Mainnet upgrade: v1.0.2
# Mainnet upgrade: v{AXELARD}

import { Callout } from '/src/components/callout'
import { Callout } from '/src/components/callout';
import { AXELARD, TOFND } from '/src/config/variables';

## About the mainnet v1.0 upgrade

This release enables mainnet deployment for [Amplifier](/dev/amplifier/introduction).

This release includes the following version updates:
- `axelard` and `vald` to [1.0.2](https://github.com/axelarnetwork/axelar-core/releases/tag/v1.0.2)
- `axelard` and `vald` to [1.0.4](https://github.com/axelarnetwork/axelar-core/releases/tag/v1.0.4)
- `tofnd` to [1.0.1](https://github.com/axelarnetwork/tofnd/releases/tag/v1.0.1)


Expand All @@ -25,7 +26,7 @@ See all the changes in the [`axelar-core` release notes](https://github.com/axel
Upgrade height `14231100` at approximately **2:30PM UTC on August 28th, 2024** ([countdown](https://www.mintscan.io/axelar/block/14231100))

<Callout type="warning" emoji="⚠️">
As of v1.0.2, the `axelard` [binary releases](https://github.com/axelarnetwork/axelar-core/releases) require `GLIBC_2.34`, which is not present on Ubuntu 20.04.
As of v{AXELARD}, the `axelard` [binary releases](https://github.com/axelarnetwork/axelar-core/releases) require `GLIBC_2.34`, which is not present on Ubuntu 20.04.

You will need to compile `axelard` from source, or upgrade to Ubuntu 22.04.
</Callout>
Expand Down Expand Up @@ -64,8 +65,8 @@ cp -r ~/.axelar/.core/data ~/.axelar-lisbon-3-upgrade-0.35/.core/data
excluding them from any data backups.
</Callout>

4. Restart your `axelard` node with the new `v1.0.2` build.
5. If you're a validator also restart `vald` with `v1.0.2` and `tofnd` with `v1.0.1`.
4. Restart your `axelard` node with the new v{AXELARD} build.
5. If you're a validator also restart `vald` with v{AXELARD} and `tofnd` with v{TOFND}.


Example using join scripts in [axelarate-community git repo](https://github.com/axelarnetwork/axelarate-community):
Expand All @@ -74,7 +75,7 @@ Example using join scripts in [axelarate-community git repo](https://github.com/
# in axelarate-community repo (https://github.com/axelarnetwork/axelarate-community)
git checkout main
git pull
KEYRING_PASSWORD="pw-1" ./scripts/node.sh -n testnet -a v1.0.2
KEYRING_PASSWORD="pw-1" ./scripts/node.sh -n testnet -a v1.0.4
# For validators, restart vald/tofnd
KEYRING_PASSWORD="pw-1" TOFND_PASSWORD="pw-2" ./scripts/validator-tools-host.sh -n testnet -a v1.0.2 -q v1.0.1
KEYRING_PASSWORD="pw-1" TOFND_PASSWORD="pw-2" ./scripts/validator-tools-host.sh -n testnet -a v1.0.4 -q v1.0.1
```
13 changes: 7 additions & 6 deletions src/content/docs/resources/testnet/upgrades/v1.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Testnet upgrade: v1.0

import { Callout } from '/src/components/callout'
import { Callout } from '/src/components/callout';
import { AXELARD_TESTNET } from '/src/config/variables';

## About the v1.0 upgrade

Expand Down Expand Up @@ -60,11 +61,11 @@ cp -r ~/.axelar_testnet/.core/data ~/.axelar-lisbon-3-upgrade-0.35/.core/data
excluding them from any data backups.
</Callout>

4. Restart your `axelard` node with the new `v1.0.0` build.
5. If you're a validator also restart `vald` with `v1.0.0` and `tofnd` with `v0.10.1`.
4. Restart your `axelard` node with the new v{AXELARD_TESTNET} build.
5. If you're a validator also restart `vald` with v{AXELARD_TESTNET} and `tofnd` with `v1.0.1`.

<Callout type="warning" emoji="⚠️">
[`tofnd` 1.0.1 has been released](https://github.com/axelarnetwork/tofnd/releases), but we recommend adopting `v1.0.1` of `tofnd` over the coming days, independently from the upgrade.
[`tofnd` 1.0.1 has been released](https://github.com/axelarnetwork/tofnd/releases), and we recommend adopting `v1.0.1` of `tofnd` independently from the upgrade.
</Callout>

Example using join scripts in [axelarate-community git repo](https://github.com/axelarnetwork/axelarate-community):
Expand All @@ -73,7 +74,7 @@ Example using join scripts in [axelarate-community git repo](https://github.com/
# in axelarate-community repo (https://github.com/axelarnetwork/axelarate-community)
git checkout main
git pull
KEYRING_PASSWORD="pw-1" ./scripts/node.sh -n testnet -a v1.0.2
KEYRING_PASSWORD="pw-1" ./scripts/node.sh -n testnet -a v1.0.4
# For validators, restart vald/tofnd
KEYRING_PASSWORD="pw-1" TOFND_PASSWORD="pw-2" ./scripts/validator-tools-host.sh -n testnet -a v1.0.2 -q v0.10.1
KEYRING_PASSWORD="pw-1" TOFND_PASSWORD="pw-2" ./scripts/validator-tools-host.sh -n testnet -a v1.0.4 -q v0.10.1
```
2 changes: 1 addition & 1 deletion src/content/docs/validator/amplifier/error-messages.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following are some common error messages encountered when working with verif

- `connection failed: transport error``ampd` can't connect to `tofnd`. Make sure that you have tofnd running in the background and that the port and hots `tofnd` is listening on match the information in your `ampd` config file.

- **axelard cannot be opened because the developer cannot be verified** (Mac) — Disable the gatekeeper for a single binary with `sudo xattr -d com.apple.quarantine ~/Downloads/ampd-darwin-arm64-v1.0.0`, or disable gatekeeper globally with `sudo spctl --master-disable`.
- **axelard cannot be opened because the developer cannot be verified** (Mac) — Disable the gatekeeper for a single binary with `sudo xattr -d com.apple.quarantine ~/Downloads/ampd-darwin-arm64-v1.2.0`, or disable gatekeeper globally with `sudo spctl --master-disable`.

- `error trying to connect: received corrupt message` — Your RPC server may not support HTTPS. Try HTTP instead.

Expand Down
37 changes: 19 additions & 18 deletions src/content/docs/validator/amplifier/verifier-onboarding.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Become an Amplifier Verifier

import { Callout } from "/src/components/callout";
import { AMPD } from '/src/config/variables';

<Callout>
The Axelar Virtual Machine (AVM) and Amplifier are currently under active
Expand Down Expand Up @@ -97,24 +98,24 @@ Leave this process running in the background, and perform additional commands in

<tab-item title="Binary">
Download the [`ampd`
binary](https://github.com/axelarnetwork/axelar-amplifier/releases/tag/ampd-v1.0.0)
binary](https://github.com/axelarnetwork/axelar-amplifier/releases/tag/ampd-v1.2.0)
depending on the type of machine you have:
- Linux:
[`ampd-linux-amd64-v1.0.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.0.0/ampd-linux-amd64-v1.0.0)
[`ampd-linux-amd64-v1.2.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.2.0/ampd-linux-amd64-v1.2.0)
- Apple Silicon Mac:
[`ampd-darwin-arm64-v1.0.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.0.0/ampd-darwin-arm64-v1.0.0)
[`ampd-darwin-arm64-v1.2.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.2.0/ampd-darwin-arm64-v1.2.0)
- Intel Mac:
[`ampd-darwin-amd64-v1.0.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.0.0/ampd-darwin-amd64-v1.0.0)
[`ampd-darwin-amd64-v1.2.0`](https://github.com/axelarnetwork/axelar-amplifier/releases/download/ampd-v1.2.0/ampd-darwin-amd64-v1.2.0)
</tab-item>

<tab-item title="Docker">
From [Docker](https://hub.docker.com/r/axelarnet/axelar-ampd), pull and run the `1.0.0` version of `ampd`:
From [Docker](https://hub.docker.com/r/axelarnet/axelar-ampd), pull and run the `1.2.0` version of `ampd`:



```bash
docker pull axelarnet/axelar-ampd:v1.0.0
docker run axelarnet/axelar-ampd:v1.0.0 verifier-address
docker pull axelarnet/axelar-ampd:v1.2.0
docker run axelarnet/axelar-ampd:v1.2.0 verifier-address
```

</tab-item>
Expand All @@ -134,30 +135,30 @@ This will allow you to begin commands with `ampd`. If you set up `ampd` through
1. Add a symbolic link named `ampd` in your binaries folder.:

```bash
sudo ln -s ~/Downloads/ampd-*-v1.0.0 /usr/local/bin/ampd
sudo ln -s ~/Downloads/ampd-*-v1.2.0 /usr/local/bin/ampd
```

1. Make the binary executable:

```bash
chmod a+x ~/Downloads/ampd-*-v1.0.0
chmod a+x ~/Downloads/ampd-*-v*
```

1. Restart your terminal.

1. Run `ampd --version` to make sure that the right version of `ampd` is being used. It should be `ampd 1.0.0`.
1. Run `ampd --version` to make sure that the right version of `ampd` is being used. It should be {AMPD}.

</tab-item>

<tab-item title="<code>bash</code> alias">
<Callout>
Replace `ampd-darwin-arm64-v1.0.0` with the [`ampd` binary you downloaded](/validator/amplifier/verifier-onboarding#set-up-ampd).
Replace `ampd-darwin-arm64-v1.2.0` with the [`ampd` binary you downloaded](/validator/amplifier/verifier-onboarding#set-up-ampd).
</Callout>

1. Add an alias to `ampd` at the end of the `.bashrc` file on your machine:

```bash
echo "ampd=~/Downloads/ampd-darwin-arm64-v1.0.0" >> ~/.bashrc
echo "ampd=~/Downloads/ampd-darwin-arm64-v1.2.0" >> ~/.bashrc
```

1. Save and close the file.
Expand All @@ -170,18 +171,18 @@ This will allow you to begin commands with `ampd`. If you set up `ampd` through

1. Restart your terminal.

1. Run `ampd --version` to make sure that the right version of `ampd` was installed on your machine. It should be `ampd 1.0.0`.
1. Run `ampd --version` to make sure that the right version of `ampd` was installed on your machine. It should be {AMPD}.

</tab-item>

<tab-item title="<code>zsh</code> alias">
<Callout>
Replace `ampd-darwin-arm64-v1.0.0` with the [`ampd` binary you downloaded](/validator/amplifier/verifier-onboarding#set-up-ampd).
Replace `ampd-darwin-arm64-v1.2.0` with the [`ampd` binary you downloaded](/validator/amplifier/verifier-onboarding#set-up-ampd).
</Callout>
1. Add an alias to `ampd` at the end of the `.zshrc` file on your machine:

```bash
echo "ampd=~/Downloads/ampd-darwin-arm64-v1.0.0" >> ~/.zshrc
echo "ampd=~/Downloads/ampd-darwin-arm64-v1.2.0" >> ~/.zshrc
```

1. Save and close the file.
Expand All @@ -194,7 +195,7 @@ This will allow you to begin commands with `ampd`. If you set up `ampd` through

1. Restart your terminal.

1. Run `ampd --version` to make sure that the right version of `ampd` was installed on your machine. It should be `ampd 1.0.0`.
1. Run `ampd --version` to make sure that the right version of `ampd` was installed on your machine. It should be {AMPD}.

</tab-item>

Expand Down Expand Up @@ -355,7 +356,7 @@ The following are an example `config.toml` files:
</tab-item>
<tab-item title="mainnet">
```toml
# replace with your Axelar testnet node
# replace with your Axelar mainnet node
tm_jsonrpc="http://127.0.0.1:26657"
tm_grpc="tcp://127.0.0.1:9090"
event_buffer_cap=100000
Expand Down Expand Up @@ -437,7 +438,7 @@ Prior to running the `ampd` daemon, you will need to set up your wallet with dev
Silicon Mac, you can disable the
[gatekeeper](https://support.apple.com/guide/security/gatekeeper-and-runtime-protection-sec5599b66df/web)
for a single binary with `sudo xattr -d com.apple.quarantine
~/Downloads/ampd-darwin-arm64-v1.0.0` or disable gatekeeper globally with
~/Downloads/ampd-darwin-arm64-v1.2.0` or disable gatekeeper globally with
`sudo spctl --master-disable`.
</Callout>

Expand Down
4 changes: 2 additions & 2 deletions src/content/docs/validator/setup/manual.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Check the appropriate version for the network accordingly:
<tabs>
<tab-item title="Mainnet">
```bash
AXELARD_RELEASE=v1.0.2
AXELARD_RELEASE=v1.0.4
TOFND_RELEASE=v1.0.1
WASMVM_RELEASE=v1.3.1
```

</tab-item>
<tab-item title="Testnet">
```bash
AXELARD_RELEASE=v1.0.2
AXELARD_RELEASE=v1.0.4
TOFND_RELEASE=v1.0.1
WASMVM_RELEASE=v1.3.1
```
Expand Down
Loading

0 comments on commit ee28a0b

Please sign in to comment.