Skip to content

Commit

Permalink
crypto: Use bech32 for SuiAddress and ObjectID
Browse files Browse the repository at this point in the history
  • Loading branch information
@joyqvq
joyqvq committed Dec 7, 2022
1 parent 7dab34a commit 1c72963
Show file tree
Hide file tree
Showing 58 changed files with 637 additions and 700 deletions.
12 changes: 10 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "5b
move-bytecode-verifier = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
move-cli = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
move-compiler = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
move-core-types = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7", features = ["address20"] }
move-core-types = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7", features = ["address32"] }
move-disassembler = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
move-package = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
move-stdlib = { git = "https://github.com/move-language/move", rev = "5bb2ac5a4a69e6f2df06183aec9b69c6d940f9f7" }
Expand Down
20 changes: 10 additions & 10 deletions apps/explorer/src/components/top-validators-card/mockData.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,52 +17,52 @@ const validators: TestValidatorInfo[] = [
{
name: 'Jump Crypto',
stake: BigInt(9_220_000),
suiAddress: '0x693447224cf96c7b1f8de90d15198ceea22439e5',
suiAddress: 'sui1zupu00ayxqddcu3vrthm2ppe9409r504fqn7cjwl9lpmsjufqjhss6yl72',
},
{
name: 'Blockdaemon',
stake: BigInt(8_220_000),
suiAddress: '0x4497a41750e240f7a3352215c78b1e8ce9d605c1',
suiAddress: 'sui1r8e5df4tf99jwuf6s0n8mkdauspfcq3yd3xd5twej7e2qlshwamqyt60u9',
},
{
name: 'Kraken',
stake: BigInt(4_650_000),
suiAddress: '0xdb3d8f18e40e7fdcb4a3179e029044595e33cf76',
suiAddress: 'sui1tqdprxn9wmfm2q44m3ruthjf0dm5u6x2cdm3n2py44a57ete07gsg5xll6',
},
{
name: 'Coinbase',
stake: BigInt(4_550_000),
suiAddress: '0xf2f70c204eed5c33a9bb3eb4c0e3048edbbc3ac3',
suiAddress: 'sui1w9zfmw8lgxx6ngq9gc2r05yxh8c0lthws0zz72fgzmvgs8gdu4cqsdwhs2',
},
{
name: 'a16z',
stake: BigInt(2_860_000),
suiAddress: '0xf446d537680e4601f8fdc922ab897cc78f3706d7',
suiAddress: 'sui1sau0w2w6j38k2tqtx0t87w9uaackz4gq5qagletswavsnc3n59ksjtk7gf',
},
{
name: 'Figment',
stake: BigInt(2_840_000),
suiAddress: '0x1c83e3c2fe69dd15f60633cf072c3840adef504b',
suiAddress: 'sui1nm3vwhtt858whaa5w3gepanuhqprujaq8vdsksq8a0usyv3mjxjq9nz5fq',
},
{
name: 'Another One',
stake: BigInt(2_730_000),
suiAddress: '0x62afdd1fb17dbeb5325a0f3f6d073ba05bf1b958',
suiAddress: 'sui1hexrm8m3zre03hjl5t8psga34427ply4kz29dze62w8zrkjlt9esv4rnx2',
},
{
name: 'Someone Else',
stake: BigInt(2_730_000),
suiAddress: '0xdd0b64b253fe55b71f9784afee2dfa2e8bbd1ab7',
suiAddress: 'sui1cn6rfe7l2ngxtuwy4z2kpcaktljyghwh3c7jzevxh5w223dzpgxqz7l4hf',
},
{
name: '4Pool',
stake: BigInt(2_730_000),
suiAddress: '0xd4394c1577ca125630f652428d071a7b7dd047ad',
suiAddress: 'sui1mne690jmzjda8jj34cmsd6kju5vlct88azu3z8q5l2jf7yk9f24sdu9738',
},
{
name: '3Pool',
stake: BigInt(2_730_000),
suiAddress: '0xb0ecf49920c6a46104e94d810a9e81db17a6e866',
suiAddress: 'sui1mne690jmzjda8jj34cmsd6kju5vlct88azu3z8q5l2jf7yk9f24sdu9738',
},
];

Expand Down
3 changes: 1 addition & 2 deletions apps/explorer/src/utils/stringUtils.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// Copyright (c) Mysten Labs, Inc.
// SPDX-License-Identifier: Apache-2.0

import type { SuiAddress } from '@mysten/sui.js';
import { SuiAddress, SUI_ADDRESS_LENGTH } from '@mysten/sui.js';

const IPFS_START_STRING = 'https://ipfs.io/ipfs/';
const SUI_ADDRESS_LENGTH = 20;

export function hexToAscii(hex: string) {
if (!hex || typeof hex != 'string') return;
Expand Down
5 changes: 0 additions & 5 deletions apps/wallet/src/ui/app/components/address-input/validation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ export const SUI_ADDRESS_VALIDATION = Yup.string()
.ensure()
.trim()
.required()
.transform((value: string) =>
value.startsWith('0x') || value === '' || value === '0'
? value
: `0x${value}`
)
.test(
'is-sui-address',
// eslint-disable-next-line no-template-curly-in-string
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-config/src/genesis.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ fn process_package(
.iter()
.zip(input_objects.iter())
.all(|(kind, obj_opt)| obj_opt.is_some()
|| to_be_published_addresses.contains(&kind.object_id()))
|| to_be_published_addresses.contains(&kind.object_id().into()))
);
}
let filtered = inputs
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-config/tests/snapshots/snapshot_tests__empty_genesis_snapshot_matches.snap
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions crates/sui-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,69 +7,69 @@ committee_size: 4
grpc_load_shed: ~
grpc_concurrency_limit: 20000000000
accounts:
- address: 33d3e552666edc4f048c74e0d2776d0b18171e31
- address: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_objects:
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
gas_object_ranges: []
- address: 33d3e552666edc4f048c74e0d2776d0b18171e31
- address: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_objects:
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
gas_object_ranges: []
- address: 33d3e552666edc4f048c74e0d2776d0b18171e31
- address: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_objects:
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
gas_object_ranges: []
- address: 33d3e552666edc4f048c74e0d2776d0b18171e31
- address: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_objects:
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
gas_object_ranges: []
- address: 33d3e552666edc4f048c74e0d2776d0b18171e31
- address: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_objects:
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
- object_id: "0x33d3e552666edc4f048c74e0d2776d0b18171e31"
- object_id: sui1x0f725nxdmwy7pyvwnsdyamdpvvpw833cq6nujffuua6s340vq4sc5r65j
gas_value: 100000000000000
gas_object_ranges: []

Loading

0 comments on commit 1c72963

Please sign in to comment.