diff --git a/packages/cli/examples/contract_addresses.ts b/packages/cli/examples/contract_addresses.ts
index 9e422cac20..27cb0f5ab6 100644
--- a/packages/cli/examples/contract_addresses.ts
+++ b/packages/cli/examples/contract_addresses.ts
@@ -1,29 +1,42 @@
 import { fromBech32, fromUtf8, toAscii, toBech32, toHex, toUtf8 } from "@cosmjs/encoding";
 import { Random, Sha256, sha256 } from "@cosmjs/crypto";
-import { Uint64 } from "@cosmjs/math";
+import { Uint53, Uint64 } from "@cosmjs/math";
 
 /**
  * The "Basic Address" Hash from
  * https://github.com/cosmos/cosmos-sdk/blob/v0.45.8/docs/architecture/adr-028-public-key-addresses.md
  */
-function hash(type: Uint8Array, key: Uint8Array): Uint8Array {
-  return new Sha256(sha256(type)).update(key).digest();
+function hash(type: string, key: Uint8Array): Uint8Array {
+  return new Sha256(sha256(toAscii(type))).update(key).digest();
+}
+
+/**
+ * Takes an integer [0, 255] and returns a one-byte encoding of it.
+ */
+function toUint8(int: number): number {
+  const checked = new Uint53(int).toNumber();
+  if (checked > 255) {
+    throw new Error("Integer exceeds uint8 range");
+  }
+  return checked;
 }
 
 /** See https://github.com/CosmWasm/wasmd/issues/942 */
 function deterministicContractAddress(codeId: number, creator: string, label: string, prefix: string) {
   const codeIdUint64 = Uint64.fromNumber(codeId);
   const creatorData = fromBech32(creator).data;
-  const creatorDataLen = Uint64.fromNumber(creatorData.length);
+  const labelData = toUtf8(label);
 
-  const key1 = new Uint8Array([
+  const key = new Uint8Array([
+    ...toAscii("wasm"),
+    0x00,
     ...codeIdUint64.toBytesBigEndian(),
-    ...creatorDataLen.toBytesBigEndian(),
+    toUint8(creatorData.length),
     ...creatorData,
-    ...toUtf8(label),
+    toUint8(labelData.length),
+    ...labelData,
   ]);
-  const key2 = new Uint8Array([...toAscii("wasm"), 0x00, ...key1]);
-  const addressData = hash(toAscii("module"), key2);
+  const addressData = hash("module", key);
   return toBech32(prefix, addressData);
 }
 
@@ -34,7 +47,7 @@ function makeRandomAddress(length: number): string {
 let out: Array<any> = [];
 
 for (let codeId of [1, Number.MAX_SAFE_INTEGER]) {
-for (let creator of [makeRandomAddress(20), makeRandomAddress(32)]) {
+  for (let creator of [makeRandomAddress(20), makeRandomAddress(32)]) {
     for (let label of ["instance 1", "instance 2"]) {
       const contractAddress = deterministicContractAddress(codeId, creator, label, "purple");