From 3f2ced7ef48b7e761d961695cbb3fe713452d9d9 Mon Sep 17 00:00:00 2001 From: bartosz-lipinski <264380+bartosz-lipinski@users.noreply.github.com> Date: Sat, 20 Mar 2021 18:41:24 -0500 Subject: [PATCH] feat: bridge --- packages/bridge/src/contexts/chainPair.tsx | 8 ++++++-- packages/bridge/src/models/bridge/guardianSet.ts | 2 -- packages/bridge/src/models/bridge/signatureState.ts | 9 --------- .../bridge/src/models/bridge/transfer/fromSolana.ts | 12 +----------- .../bridge/src/models/bridge/transfer/toSolana.ts | 3 +-- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/packages/bridge/src/contexts/chainPair.tsx b/packages/bridge/src/contexts/chainPair.tsx index 3b93d5f..49b6a20 100644 --- a/packages/bridge/src/contexts/chainPair.tsx +++ b/packages/bridge/src/contexts/chainPair.tsx @@ -160,13 +160,17 @@ export const useCurrencyLeg = (mintAddress: string) => { const bridgeId = programIds().wormhole.pubkey; const bridgeAuthority = await bridgeAuthorityKey(bridgeId); - wrappedAssetMintKey(bridgeId, bridgeAuthority, { + const mint = await wrappedAssetMintKey(bridgeId, bridgeAuthority, { decimals: Math.min(9, info.decimals), address: info.assetAddress, chain: info.chainID - }) + }); + + console.log(mint.toBase58()); } + console.log(info); + setInfo(info); } diff --git a/packages/bridge/src/models/bridge/guardianSet.ts b/packages/bridge/src/models/bridge/guardianSet.ts index a9ccc0c..bfc9623 100644 --- a/packages/bridge/src/models/bridge/guardianSet.ts +++ b/packages/bridge/src/models/bridge/guardianSet.ts @@ -1,7 +1,5 @@ import * as BufferLayout from 'buffer-layout'; -/// ForeignAddress u8 - 32 - // 420 export const GuardianSetLayout: typeof BufferLayout.Structure = BufferLayout.struct( [ diff --git a/packages/bridge/src/models/bridge/signatureState.ts b/packages/bridge/src/models/bridge/signatureState.ts index 809df0f..4d6bece 100644 --- a/packages/bridge/src/models/bridge/signatureState.ts +++ b/packages/bridge/src/models/bridge/signatureState.ts @@ -1,15 +1,6 @@ // 1340 - SigState - (VerifySignatures - parameter 4) // export const NOP = 0; -// pub struct SignatureState { -// /// signatures of validators -// pub signatures: [[u8; 65]; MAX_LEN_GUARDIAN_KEYS], - -// /// hash of the data -// pub hash: [u8; 32], - -// } - import * as BufferLayout from 'buffer-layout'; // 1184 TransferOutProposal diff --git a/packages/bridge/src/models/bridge/transfer/fromSolana.ts b/packages/bridge/src/models/bridge/transfer/fromSolana.ts index 3962d33..d6b8dd2 100644 --- a/packages/bridge/src/models/bridge/transfer/fromSolana.ts +++ b/packages/bridge/src/models/bridge/transfer/fromSolana.ts @@ -1,14 +1,4 @@ -import { - programIds, - getMultipleAccounts, - sendTransaction, - cache, - TokenAccountParser, - ParsedAccount, - formatAmount, - createAssociatedTokenAccountInstruction, - toLamports, -} from '@oyster/common'; +import { programIds, sendTransaction } from '@oyster/common'; import { WalletAdapter } from '@solana/wallet-base'; import { ethers } from 'ethers'; import { WormholeFactory } from '../../../contracts/WormholeFactory'; diff --git a/packages/bridge/src/models/bridge/transfer/toSolana.ts b/packages/bridge/src/models/bridge/transfer/toSolana.ts index 1dce0ae..90b0e3d 100644 --- a/packages/bridge/src/models/bridge/transfer/toSolana.ts +++ b/packages/bridge/src/models/bridge/transfer/toSolana.ts @@ -5,7 +5,6 @@ import { cache, TokenAccountParser, ParsedAccount, - formatAmount, createAssociatedTokenAccountInstruction, } from '@oyster/common'; import { ethers } from 'ethers'; @@ -140,7 +139,7 @@ export const toSolana = async ( step: counter++, }); - const { txid } = await sendTransaction( + await sendTransaction( connection, wallet, instructions,