diff --git a/web/src/App/App.tsx b/web/src/App/App.tsx
index 18c5ac1e..d9e74d06 100644
--- a/web/src/App/App.tsx
+++ b/web/src/App/App.tsx
@@ -39,8 +39,8 @@ function App() {
diff --git a/web/src/components/TransferInitiator.tsx b/web/src/components/TransferInitiator.tsx
index 45889f56..1147f3cd 100644
--- a/web/src/components/TransferInitiator.tsx
+++ b/web/src/components/TransferInitiator.tsx
@@ -70,11 +70,12 @@ async function createWrapped(c: Connection, b: SolanaBridge, wallet: Wallet, met
let tx = new Transaction();
// @ts-ignore
- let [ix_account, newSigner] = await b.createWrappedAssetAndAccountInstructions(key.publicKey, mint, meta);
+ let [ix_account, newSigner] = await b.createWrappedAssetAndAccountInstructions(wallet.publicKey, mint, meta);
let recentHash = await c.getRecentBlockhash();
tx.recentBlockhash = recentHash.blockhash
tx.add(...ix_account)
tx.feePayer = wallet.publicKey;
+ tx.sign(newSigner);
let signed = await wallet.signTransaction(tx);
message.loading({content: "Waiting for transaction to be confirmed...", key: "tx", duration: 1000})
await c.sendRawTransaction(signed.serialize(), {preflightCommitment: "single"})
@@ -240,7 +241,7 @@ export default function TransferInitiator(params: TransferInitiatorParams) {
{
if (v.target.value === "") {
setAmount(new BigNumber(0));
diff --git a/web/src/config.ts b/web/src/config.ts
index 5c3cea23..2e7fb971 100644
--- a/web/src/config.ts
+++ b/web/src/config.ts
@@ -1,13 +1,13 @@
import {PublicKey} from "@solana/web3.js";
-const BRIDGE_ADDRESS = "0xdae0Cba01eFc4bfEc1F7Fece73Fe8b8d2Eda65B0";
-const WRAPPED_MASTER = "9f7bedd9ef2d57eccab2cb56a5bd395edbb77df8"
+const BRIDGE_ADDRESS = "0xf92cD566Ea4864356C5491c177A430C222d7e678";
+const WRAPPED_MASTER = "9A5e27995309a03f8B583feBdE7eF289FcCdC6Ae"
-const SOLANA_BRIDGE_PROGRAM = new PublicKey("BrdgiFmZN3BKkcY3danbPYyxPKwb8RhQzpM2VY5L97ED");
+const SOLANA_BRIDGE_PROGRAM = new PublicKey("WormT3McKhFJ2RkiGpdw9GKvNCrB2aB54gb2uV9MfQC");
const TOKEN_PROGRAM = new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-const SOLANA_HOST = "https://testnet.solana.com";
+const SOLANA_HOST = "https://solana-api.projectserum.com";
export {
BRIDGE_ADDRESS,
diff --git a/web/src/pages/Assistant.tsx b/web/src/pages/Assistant.tsx
index 0a16086a..072671b4 100644
--- a/web/src/pages/Assistant.tsx
+++ b/web/src/pages/Assistant.tsx
@@ -242,13 +242,13 @@ function Assistant() {
let startBlock = provider.blockNumber;
let completed = false;
let blockHandler = (blockNumber: number) => {
- if (blockNumber - startBlock < 5) {
+ if (blockNumber - startBlock < 15) {
setLoading({
loading: true,
message: "Awaiting ETH confirmations",
progress: {
- completion: (blockNumber - startBlock) / 5 * 100,
- content: `${blockNumber - startBlock}/${5}`
+ completion: (blockNumber - startBlock) / 15 * 100,
+ content: `${blockNumber - startBlock}/${15}`
}
})
} else if (!completed) {
@@ -284,7 +284,7 @@ function Assistant() {
}
})
} else {
- setLoading({loading: true, message: "Awaiting guardians (TODO ping)"})
+ setLoading({loading: true, message: "Awaiting guardian confirmation"})
}
})