certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clients: replace references to sdk consts 

this will require another pass in the future, once we cut a new release of the sdk with the deployer address consts
This commit is contained in:
aki 2022-11-30 04:50:32 +00:00
parent fd37e46b7b
commit a408a5b8ff
2 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clients/js/cmds/aptos.ts
View File

@ -1,4 +1,4 @@
import { assertChain, CHAIN_ID_APTOS, CHAIN_ID_SOLANA, coalesceChainId } from "@certusone/wormhole-sdk/lib/cjs/utils/consts";
import { assertChain, CHAIN_ID_APTOS, CHAIN_ID_SOLANA, coalesceChainId, CONTRACTS } from "@certusone/wormhole-sdk/lib/cjs/utils/consts";
import { BCS, FaucetClient } from "aptos";
import { spawnSync } from 'child_process';
import { ethers } from "ethers";
@ -62,17 +62,10 @@ exports.builder = function(y: typeof yargs) {
return yargs
.option("network", network_options)
.option("rpc", rpc_description)
// TODO(csongor): once the sdk has this, just use it from there
.option("contract-address", {
alias: "a",
required: true,
describe: "Address where the wormhole module is deployed",
type: "string",
})
}, async (argv) => {
const network = argv.network.toUpperCase();
assertNetwork(network);
const contract_address = evm_address(argv["contract-address"]);
const contract_address = evm_address(CONTRACTS[network].aptos.core);
const rpc = argv.rpc ?? NETWORKS[network]["aptos"].rpc;
await callEntryFunc(network, rpc, `${contract_address}::token_bridge`, "init", [], []);
})
@ -228,11 +221,14 @@ exports.builder = function(y: typeof yargs) {
})
.option("network", network_options)
}, async (argv) => {
// TODO(csongor): this should be pulled in from the sdk.
let token_bridge_address = Buffer.from("576410486a2da45eee6c949c995670112ddf2fbeedab20350d506328eefc9d4f", "hex");
const network = argv.network.toUpperCase();
assertNetwork(network);
let address = CONTRACTS[network].aptos.token_bridge;
if (address.startsWith("0x")) address = address.substring(2);
const token_bridge_address = Buffer.from(address, "hex");
assertChain(argv["chain"]);
let chain = coalesceChainId(argv["chain"]);
let origin_address = Buffer.from(evm_address(argv["origin-address"]), "hex");
const chain = coalesceChainId(argv["chain"]);
const origin_address = Buffer.from(evm_address(argv["origin-address"]), "hex");
console.log(deriveWrappedAssetAddress(token_bridge_address, chain, origin_address))
})
.command("hash-contracts <package-dir>", "Hash contract bytecodes for upgrade", (yargs) => {
@ -255,14 +251,6 @@ exports.builder = function(y: typeof yargs) {
.positional("package-dir", {
type: "string"
})
// TODO(csongor): once the sdk has the addresses, just look that up
// based on the module
.option("contract-address", {
alias: "a",
required: true,
describe: "Address where the wormhole module is deployed",
type: "string",
})
.option("network", network_options)
.option("rpc", rpc_description)
.option("named-addresses", named_addresses)
@ -277,7 +265,7 @@ exports.builder = function(y: typeof yargs) {
const hash = await callEntryFunc(
network,
rpc,
`${argv["contract-address"]}::contract_upgrade`,
`${CONTRACTS[network].aptos.core}::contract_upgrade`,
"upgrade",
[],
[
@ -289,14 +277,6 @@ exports.builder = function(y: typeof yargs) {
})
.command("migrate", "Perform migration after contract upgrade", (_yargs) => {
return yargs
// TODO(csongor): once the sdk has the addresses, just look that up
// based on the module
.option("contract-address", {
alias: "a",
required: true,
describe: "Address where the wormhole module is deployed",
type: "string",
})
.option("network", network_options)
.option("rpc", rpc_description)
}, async (argv) => {
@ -308,7 +288,7 @@ exports.builder = function(y: typeof yargs) {
const hash = await callEntryFunc(
network,
rpc,
`${argv["contract-address"]}::contract_upgrade`,
`${CONTRACTS[network].aptos.core}::contract_upgrade`,
"migrate",
[],
[])

8
sdk/js/src/utils/consts.ts
View File

@ -54,8 +54,7 @@ export type EVMChainName =
| "neon"
| "arbitrum"
| "optimism"
| "gnosis"
;
| "gnosis";
/**
*
@ -787,6 +786,11 @@ export function assertEVMChain(
export const WSOL_ADDRESS = "So11111111111111111111111111111111111111112";
export const WSOL_DECIMALS = 9;
export const MAX_VAA_DECIMALS = 8;
export const APTOS_DEPLOYER_ADDRESS =
"0108bc32f7de18a5f6e1e7d6ee7aff9f5fc858d0d87ac0da94dd8d2a5d267d6b";
export const APTOS_DEPLOYER_ADDRESS_DEVNET =
"277fa055b6a73c42c0662d5236c65c864ccbf2d4abd21f174a30c8b786eab84b";
export const APTOS_TOKEN_BRIDGE_EMITTER_ADDRESS =
"0000000000000000000000000000000000000000000000000000000000000001";