Working solana transfers from webui
This commit is contained in:
Hendrik Hofstadt
parent
8b34a3c534
commit
5cd3db9a14
|
|
@ -2277,7 +2277,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "solana-crate-features"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/jackcmay/solana?branch=cpi-create-account#d84010e4afe5f79c812ff7da349460dc690a8392"
|
||||
source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes 0.4.12",
|
||||
|
|
@ -2334,7 +2334,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "solana-logger"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/jackcmay/solana?branch=cpi-create-account#d84010e4afe5f79c812ff7da349460dc690a8392"
|
||||
source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
|
||||
dependencies = [
|
||||
"env_logger",
|
||||
"lazy_static",
|
||||
|
|
@ -2401,7 +2401,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "solana-sdk"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/jackcmay/solana?branch=cpi-create-account#d84010e4afe5f79c812ff7da349460dc690a8392"
|
||||
source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"bincode",
|
||||
|
|
@ -2439,7 +2439,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "solana-sdk-macro"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/jackcmay/solana?branch=cpi-create-account#d84010e4afe5f79c812ff7da349460dc690a8392"
|
||||
source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
|
||||
dependencies = [
|
||||
"bs58",
|
||||
"proc-macro2 1.0.19",
|
||||
|
|
@ -2464,7 +2464,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "solana-sdk-macro-frozen-abi"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/jackcmay/solana?branch=cpi-create-account#d84010e4afe5f79c812ff7da349460dc690a8392"
|
||||
source = "git+https://github.com/solana-labs/solana#46830124f8b98c72ff58e6e1c723fb1cbdb75e4e"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"proc-macro2 1.0.19",
|
||||
|
|
@ -2579,6 +2579,19 @@ dependencies = [
|
|||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spl-token"
|
||||
version = "1.0.8"
|
||||
dependencies = [
|
||||
"cbindgen",
|
||||
"num-derive 0.3.1",
|
||||
"num-traits",
|
||||
"rand",
|
||||
"remove_dir_all",
|
||||
"solana-sdk",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spl-token"
|
||||
version = "1.0.8"
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
members = ["agent", "bridge", "cli"]
|
||||
|
||||
[patch.crates-io]
|
||||
solana-sdk = { git="https://github.com/jackcmay/solana", branch="cpi-create-account" }
|
||||
solana-sdk = { git="https://github.com/solana-labs/solana", branch="master" }
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ pub struct InitializePayload {
|
|||
}
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Clone, Copy)]
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct TransferOutPayload {
|
||||
/// amount to transfer
|
||||
pub amount: U256,
|
||||
|
|
@ -55,6 +55,21 @@ pub struct TransferOutPayload {
|
|||
pub nonce: u32,
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct TransferOutPayloadRaw {
|
||||
/// amount to transfer
|
||||
pub amount: [u8; 32],
|
||||
/// chain id to transfer to
|
||||
pub chain_id: u8,
|
||||
/// Information about the asset to be transferred
|
||||
pub asset: AssetMeta,
|
||||
/// address on the foreign chain to transfer to
|
||||
pub target: ForeignAddress,
|
||||
/// unique nonce of the transfer
|
||||
pub nonce: u32,
|
||||
}
|
||||
|
||||
/// Instructions supported by the SwapInfo program.
|
||||
#[repr(C)]
|
||||
pub enum BridgeInstruction {
|
||||
|
|
@ -121,9 +136,16 @@ impl BridgeInstruction {
|
|||
Initialize(*payload)
|
||||
}
|
||||
1 => {
|
||||
let payload: &TransferOutPayload = unpack(input)?;
|
||||
let payload: &TransferOutPayloadRaw = unpack(input)?;
|
||||
let amount = U256::from_big_endian(&payload.amount);
|
||||
|
||||
TransferOut(*payload)
|
||||
TransferOut(TransferOutPayload {
|
||||
amount,
|
||||
chain_id: payload.chain_id,
|
||||
asset: payload.asset,
|
||||
target: payload.target,
|
||||
nonce: payload.nonce,
|
||||
})
|
||||
}
|
||||
2 => {
|
||||
let payload: VAAData = input[1..].to_vec();
|
||||
|
|
@ -155,9 +177,19 @@ impl BridgeInstruction {
|
|||
output[0] = 1;
|
||||
#[allow(clippy::cast_ptr_alignment)]
|
||||
let value = unsafe {
|
||||
&mut *(&mut output[size_of::<u8>()] as *mut u8 as *mut TransferOutPayload)
|
||||
&mut *(&mut output[size_of::<u8>()] as *mut u8 as *mut TransferOutPayloadRaw)
|
||||
};
|
||||
|
||||
let mut amount_bytes = [0u8; 32];
|
||||
payload.amount.to_big_endian(&mut amount_bytes);
|
||||
|
||||
*value = TransferOutPayloadRaw {
|
||||
amount: amount_bytes,
|
||||
chain_id: payload.chain_id,
|
||||
asset: payload.asset,
|
||||
target: payload.target,
|
||||
nonce: payload.nonce,
|
||||
};
|
||||
*value = payload;
|
||||
}
|
||||
Self::PostVAA(payload) => {
|
||||
output[0] = 2;
|
||||
|
|
@ -334,7 +366,6 @@ pub fn post_vaa(
|
|||
}
|
||||
VAABody::Transfer(t) => {
|
||||
if t.source_chain == CHAIN_ID_SOLANA {
|
||||
println!("kot");
|
||||
// Solana (any) -> Ethereum (any)
|
||||
let transfer_key = Bridge::derive_transfer_id(
|
||||
program_id,
|
||||
|
|
@ -385,7 +416,7 @@ pub fn post_vaa(
|
|||
/// Unpacks a reference from a bytes buffer.
|
||||
pub fn unpack<T>(input: &[u8]) -> Result<&T, ProgramError> {
|
||||
if input.len() < size_of::<u8>() + size_of::<T>() {
|
||||
return Err(ProgramError::InvalidAccountData);
|
||||
return Err(ProgramError::InvalidInstructionData);
|
||||
}
|
||||
#[allow(clippy::cast_ptr_alignment)]
|
||||
let val: &T = unsafe { &*(&input[1] as *const u8 as *const T) };
|
||||
|
|
|
|||
|
|
@ -915,9 +915,10 @@ mod tests {
|
|||
state::{Account as SplAccount, Mint as SplMint},
|
||||
};
|
||||
|
||||
use crate::instruction::initialize;
|
||||
use crate::instruction::{initialize, TransferOutPayloadRaw};
|
||||
|
||||
use super::*;
|
||||
use std::str::FromStr;
|
||||
|
||||
const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array([1u8; 32]);
|
||||
|
||||
|
|
|
|||
|
|
@ -114,35 +114,34 @@ fn command_lock_tokens(
|
|||
},
|
||||
};
|
||||
|
||||
let ix = transfer_out(
|
||||
bridge,
|
||||
&config.owner.pubkey(),
|
||||
&account,
|
||||
&token,
|
||||
&TransferOutPayload {
|
||||
amount: U256::from(amount),
|
||||
chain_id: to_chain,
|
||||
asset: asset_meta,
|
||||
target,
|
||||
nonce,
|
||||
},
|
||||
)?;
|
||||
println!("custody: {}, ", ix.accounts[7].pubkey.to_string());
|
||||
|
||||
let mut instructions = vec![];
|
||||
// Approve tokens
|
||||
if asset_meta.chain == CHAIN_ID_SOLANA {
|
||||
let ix_a = approve(
|
||||
let mut instructions = vec![
|
||||
approve(
|
||||
&spl_token::id(),
|
||||
&account,
|
||||
&ix.accounts[4].pubkey,
|
||||
&bridge_key,
|
||||
&config.owner.pubkey(),
|
||||
&[],
|
||||
amount,
|
||||
)?;
|
||||
instructions.push(ix_a);
|
||||
}
|
||||
instructions.push(ix);
|
||||
)?,
|
||||
transfer_out(
|
||||
bridge,
|
||||
&config.owner.pubkey(),
|
||||
&account,
|
||||
&token,
|
||||
&TransferOutPayload {
|
||||
amount: U256::from(amount),
|
||||
chain_id: to_chain,
|
||||
asset: asset_meta,
|
||||
target,
|
||||
nonce,
|
||||
},
|
||||
)?,
|
||||
];
|
||||
|
||||
println!(
|
||||
"custody: {}, ",
|
||||
instructions[1].accounts[8].pubkey.to_string()
|
||||
);
|
||||
|
||||
let mut transaction =
|
||||
Transaction::new_with_payer(&instructions.as_slice(), Some(&config.fee_payer.pubkey()));
|
||||
|
|
@ -865,7 +864,6 @@ fn main() {
|
|||
.index(2)
|
||||
.required(true)
|
||||
.help("Address of the initial guardian"),
|
||||
|
||||
))
|
||||
.subcommand(
|
||||
SubCommand::with_name("lock")
|
||||
|
|
|
|||
|
|
@ -1603,6 +1603,15 @@
|
|||
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
|
||||
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
|
||||
},
|
||||
"@project-serum/sol-wallet-adapter": {
|
||||
"version": "0.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@project-serum/sol-wallet-adapter/-/sol-wallet-adapter-0.1.0.tgz",
|
||||
"integrity": "sha512-9oWExTmNcw9qfgsPn6nyH6+XFvIHk9XEgJazdB5P/SnkV2s6SQWA/qWhvt5Au4+3rp5oWXK5skPs0vQZ1OYgKw==",
|
||||
"requires": {
|
||||
"bs58": "^4.0.1",
|
||||
"eventemitter3": "^4.0.4"
|
||||
}
|
||||
},
|
||||
"@sheerun/mutationobserver-shim": {
|
||||
"version": "0.3.3",
|
||||
"resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
|
||||
|
|
@ -1670,9 +1679,9 @@
|
|||
}
|
||||
},
|
||||
"@solana/web3.js": {
|
||||
"version": "0.70.3",
|
||||
"resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-0.70.3.tgz",
|
||||
"integrity": "sha512-Q9byc2doeycUHai47IVkdM2DAWhpnV+K7OPxNivTph1a7bDRcULp0n9X7QTycJCz5E9+qx3KUduD1J2Xk/zH0Q==",
|
||||
"version": "0.71.4",
|
||||
"resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-0.71.4.tgz",
|
||||
"integrity": "sha512-YSOqGpl7KQ/fEDHuHl99zsEkno4kGNoS21qh2+gurE98sCX2RP77GhE5pHLDCpr2czgy5XhsW0vOlzoB/PZ2wA==",
|
||||
"requires": {
|
||||
"@babel/runtime": "^7.3.1",
|
||||
"bn.js": "^5.0.0",
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@project-serum/sol-wallet-adapter": "^0.1.0",
|
||||
"@solana/spl-token": "^0.0.5",
|
||||
"@solana/web3.js": "^0.71.4",
|
||||
"@testing-library/jest-dom": "^4.2.4",
|
||||
"@testing-library/react": "^9.3.2",
|
||||
"@testing-library/user-event": "^7.1.2",
|
||||
|
|
@ -12,17 +15,15 @@
|
|||
"@types/react-dom": "^16.9.0",
|
||||
"@types/react-router-dom": "^5.1.5",
|
||||
"antd": "^4.4.1",
|
||||
"buffer": "^5.6.0",
|
||||
"buffer-layout": "^1.2.0",
|
||||
"ethers": "^4.0.44",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "3.4.1",
|
||||
"typescript": "~3.7.2",
|
||||
"web3": "^1.2.9",
|
||||
"@solana/web3.js": "^0.70.3",
|
||||
"@solana/spl-token": "^0.0.5",
|
||||
"buffer-layout": "^1.2.0",
|
||||
"buffer": "^5.6.0",
|
||||
"react-router-dom": "^5.2.0"
|
||||
"web3": "^1.2.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"npm": "^6.14.6",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React from 'react';
|
||||
import React, {useEffect, useMemo, useState} from 'react';
|
||||
import './App.css';
|
||||
import * as solanaWeb3 from '@solana/web3.js';
|
||||
import ClientContext from '../providers/ClientContext';
|
||||
|
|
@ -8,11 +8,30 @@ import {SolanaTokenProvider} from "../providers/SolanaTokenContext";
|
|||
import {SlotProvider} from "../providers/SlotContext";
|
||||
import {BrowserRouter as Router, Link, Route, Switch} from 'react-router-dom';
|
||||
import TransferSolana from "../pages/TransferSolana";
|
||||
import WalletContext from '../providers/WalletContext';
|
||||
import Wallet from "@project-serum/sol-wallet-adapter";
|
||||
import {BridgeProvider} from "../providers/BridgeContext";
|
||||
|
||||
const {Header, Content, Footer} = Layout;
|
||||
|
||||
function App() {
|
||||
let c = new solanaWeb3.Connection("http://localhost:8899");
|
||||
const wallet = useMemo(() => new Wallet("https://www.sollet.io", "http://localhost:8899"), []);
|
||||
const [, setConnected] = useState(false);
|
||||
useEffect(() => {
|
||||
wallet.on('connect', () => {
|
||||
setConnected(true);
|
||||
console.log('Connected to wallet ' + wallet.publicKey.toBase58());
|
||||
});
|
||||
wallet.on('disconnect', () => {
|
||||
setConnected(false);
|
||||
console.log('Disconnected from wallet');
|
||||
});
|
||||
return () => {
|
||||
wallet.disconnect();
|
||||
};
|
||||
}, [wallet]);
|
||||
|
||||
return (
|
||||
<div className="App">
|
||||
<Layout style={{height: '100%'}}>
|
||||
|
|
@ -26,16 +45,21 @@ function App() {
|
|||
<div style={{padding: 24}}>
|
||||
<ClientContext.Provider value={c}>
|
||||
<SlotProvider>
|
||||
<SolanaTokenProvider>
|
||||
<Switch>
|
||||
<Route path="/solana">
|
||||
<TransferSolana/>
|
||||
</Route>
|
||||
<Route path="/">
|
||||
<Transfer/>
|
||||
</Route>
|
||||
</Switch>
|
||||
</SolanaTokenProvider>
|
||||
<WalletContext.Provider value={wallet}>
|
||||
<BridgeProvider>
|
||||
<SolanaTokenProvider>
|
||||
|
||||
<Switch>
|
||||
<Route path="/solana">
|
||||
<TransferSolana/>
|
||||
</Route>
|
||||
<Route path="/">
|
||||
<Transfer/>
|
||||
</Route>
|
||||
</Switch>
|
||||
</SolanaTokenProvider>
|
||||
</BridgeProvider>
|
||||
</WalletContext.Provider>
|
||||
</SlotProvider>
|
||||
</ClientContext.Provider>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,11 @@
|
|||
import React, {useContext} from "react"
|
||||
import {BalanceInfo, SolanaTokenContext} from "../providers/SolanaTokenContext";
|
||||
import {Table} from "antd";
|
||||
import {CHAIN_ID_SOLANA} from "../utils/bridge";
|
||||
|
||||
function SplBalances() {
|
||||
let t = useContext(SolanaTokenContext);
|
||||
|
||||
const dataSource = [
|
||||
{
|
||||
key: '1',
|
||||
name: 'Mike',
|
||||
age: 32,
|
||||
address: '10 Downing Street',
|
||||
},
|
||||
{
|
||||
key: '2',
|
||||
name: 'John',
|
||||
age: 42,
|
||||
address: '10 Downing Street',
|
||||
},
|
||||
];
|
||||
|
||||
const columns = [
|
||||
{
|
||||
title: 'Mint',
|
||||
|
|
@ -36,6 +22,13 @@ function SplBalances() {
|
|||
key: 'balance',
|
||||
render: (n: any, v: BalanceInfo) => v.balance.div(Math.pow(10, v.decimals)).toString()
|
||||
},
|
||||
{
|
||||
title: 'Wrapped',
|
||||
key: 'wrapped',
|
||||
render: (n: any, v: BalanceInfo) => {
|
||||
return v.assetMeta.chain != CHAIN_ID_SOLANA ? `Wrapped (${v.assetMeta.chain})` : "Native"
|
||||
}
|
||||
},
|
||||
];
|
||||
|
||||
return (<>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const BRIDGE_ADDRESS = "0xac3eB48829fFC3C37437ce4459cE63F1F4d4E0b4";
|
||||
|
||||
const SOLANA_BRIDGE_PROGRAM = "TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o";
|
||||
const SOLANA_BRIDGE_PROGRAM = "9Y7DSe9VGMZPmev93o2JhaAD25ZwQ7d8pPswe9LzL7Eb";
|
||||
const TOKEN_PROGRAM = "TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -164,9 +164,6 @@ function Transfer() {
|
|||
</Form>
|
||||
</Space>
|
||||
</Col>
|
||||
<Col>
|
||||
<SplBalances/>
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -1,38 +1,59 @@
|
|||
import React, {useContext, useEffect, useState} from 'react';
|
||||
import ClientContext from "../providers/ClientContext";
|
||||
import * as solanaWeb3 from '@solana/web3.js';
|
||||
import {Button, Col, Form, Input, InputNumber, Row, Select, Space} from "antd";
|
||||
import {PublicKey, Transaction} from '@solana/web3.js';
|
||||
import * as spl from '@solana/spl-token';
|
||||
import {Button, Col, Form, Input, InputNumber, message, Row, Select, Space} from "antd";
|
||||
import {BigNumber} from "ethers/utils";
|
||||
import SplBalances from "../components/SplBalances";
|
||||
import {SlotContext} from "../providers/SlotContext";
|
||||
import {SolanaTokenContext} from "../providers/SolanaTokenContext";
|
||||
import {CHAIN_ID_SOLANA} from "../utils/bridge";
|
||||
import {BridgeContext} from "../providers/BridgeContext";
|
||||
import KeyContext from "../providers/KeyContext";
|
||||
import BN from 'bn.js';
|
||||
import {TOKEN_PROGRAM} from "../config";
|
||||
|
||||
function TransferSolana() {
|
||||
let c = useContext<solanaWeb3.Connection>(ClientContext);
|
||||
let slot = useContext(SlotContext);
|
||||
let b = useContext(SolanaTokenContext);
|
||||
let bridge = useContext(BridgeContext);
|
||||
let k = useContext(KeyContext);
|
||||
|
||||
let [coinInfo, setCoinInfo] = useState({
|
||||
balance: new BigNumber(0),
|
||||
decimals: 0,
|
||||
allowance: new BigNumber(0),
|
||||
isWrapped: false,
|
||||
chainID: 0,
|
||||
wrappedAddress: ""
|
||||
wrappedAddress: new Buffer([]),
|
||||
mint: ""
|
||||
});
|
||||
let [amount, setAmount] = useState(0);
|
||||
let [amount, setAmount] = useState(new BigNumber(0));
|
||||
let [address, setAddress] = useState("");
|
||||
let [addressValid, setAddressValid] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
async function getCoinInfo(): Promise<BigNumber> {
|
||||
async function getCoinInfo() {
|
||||
let acc = b.balances.find(value => value.account.toString() == address)
|
||||
if (!acc) {
|
||||
return new BigNumber(0)
|
||||
setAmount(new BigNumber(0));
|
||||
setAddressValid(false)
|
||||
return
|
||||
}
|
||||
|
||||
return acc.balance
|
||||
setCoinInfo({
|
||||
balance: acc.balance,
|
||||
decimals: acc.decimals,
|
||||
isWrapped: acc.assetMeta.chain != CHAIN_ID_SOLANA,
|
||||
chainID: acc.assetMeta.chain,
|
||||
wrappedAddress: acc.assetMeta.address,
|
||||
mint: acc.mint
|
||||
})
|
||||
setAddressValid(true)
|
||||
}
|
||||
|
||||
getCoinInfo()
|
||||
}, [address])
|
||||
|
||||
return (
|
||||
|
|
@ -42,24 +63,48 @@ function TransferSolana() {
|
|||
<Col>
|
||||
<Space>
|
||||
<Form onFinish={(values) => {
|
||||
let recipient = new solanaWeb3.PublicKey(values["recipient"]).toBuffer()
|
||||
let transferAmount = new BigNumber(values["amount"]).mul(new BigNumber(10).pow(coinInfo.decimals));
|
||||
if (coinInfo.allowance.toNumber() >= amount || coinInfo.isWrapped) {
|
||||
//lockAssets(values["address"], transferAmount, recipient, values["target_chain"])
|
||||
} else {
|
||||
//approveAssets(values["address"], transferAmount)
|
||||
let recipient = new Buffer(values["recipient"].slice(2), "hex");
|
||||
|
||||
let transferAmount = new BN(values["amount"]).mul(new BN(10).pow(new BN(coinInfo.decimals)));
|
||||
let fromAccount = new PublicKey(values["address"])
|
||||
|
||||
let send = async () => {
|
||||
message.loading({content: "Transferring tokens...", key: "transfer"}, 1000)
|
||||
|
||||
let lock_ix = await bridge.createLockAssetInstruction(k.publicKey, fromAccount, new PublicKey(coinInfo.mint), transferAmount, values["target_chain"], recipient,
|
||||
{
|
||||
chain: coinInfo.chainID,
|
||||
address: coinInfo.wrappedAddress
|
||||
}, 2);
|
||||
let ix = spl.Token.createApproveInstruction(new PublicKey(TOKEN_PROGRAM), fromAccount, await bridge.getConfigKey(), k.publicKey, [], transferAmount.toNumber())
|
||||
|
||||
let recentHash = await c.getRecentBlockhash();
|
||||
let tx = new Transaction();
|
||||
tx.recentBlockhash = recentHash.blockhash
|
||||
tx.add(ix)
|
||||
tx.add(lock_ix)
|
||||
tx.sign(k)
|
||||
try {
|
||||
await c.sendTransaction(tx, [k])
|
||||
message.success({content: "Transfer succeeded", key: "transfer"})
|
||||
} catch (e) {
|
||||
message.error({content: "Transfer failed", key: "transfer"})
|
||||
}
|
||||
}
|
||||
send()
|
||||
}}>
|
||||
<Form.Item name="address" validateStatus={addressValid ? "success" : "error"}>
|
||||
<Input addonAfter={`Balance: ${coinInfo.balance}`} name="address"
|
||||
placeholder={"Token account Pubkey"}
|
||||
onBlur={(v) => {
|
||||
setAddress(v.target.value)
|
||||
}}/>
|
||||
<Input
|
||||
addonAfter={`Balance: ${coinInfo.balance.div(new BigNumber(Math.pow(10, coinInfo.decimals)))}`}
|
||||
name="address"
|
||||
placeholder={"Token account Pubkey"}
|
||||
onBlur={(v) => {
|
||||
setAddress(v.target.value)
|
||||
}}/>
|
||||
</Form.Item>
|
||||
<Form.Item name="amount" rules={[{
|
||||
required: true, validator: (rule, value, callback) => {
|
||||
let big = new BigNumber(value);
|
||||
let big = new BigNumber(value).mul(new BigNumber(10).pow(coinInfo.decimals));
|
||||
callback(big.lte(coinInfo.balance) ? undefined : "Amount exceeds balance")
|
||||
}
|
||||
}]}>
|
||||
|
|
@ -90,7 +135,7 @@ function TransferSolana() {
|
|||
</Form.Item>
|
||||
<Form.Item>
|
||||
<Button type="primary" htmlType="submit">
|
||||
{coinInfo.allowance.toNumber() >= amount || coinInfo.isWrapped ? "Transfer" : "Approve"}
|
||||
Transfer
|
||||
</Button>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
import React, {createContext, FunctionComponent, useContext} from "react"
|
||||
import ClientContext from "../providers/ClientContext";
|
||||
import solanaWeb3, {PublicKey} from "@solana/web3.js";
|
||||
import solanaWeb3, {Connection, PublicKey} from "@solana/web3.js";
|
||||
import {SolanaBridge} from "../utils/bridge";
|
||||
import {SOLANA_BRIDGE_PROGRAM, TOKEN_PROGRAM} from "../config";
|
||||
|
||||
// TODO
|
||||
export const BridgeContext = createContext<SolanaBridge>()
|
||||
export const BridgeContext = createContext<SolanaBridge>(new SolanaBridge(new Connection(""), new PublicKey(SOLANA_BRIDGE_PROGRAM), new PublicKey(TOKEN_PROGRAM)));
|
||||
|
||||
export const BridgeProvider: FunctionComponent = ({children}) => {
|
||||
let c = useContext<solanaWeb3.Connection>(ClientContext);
|
||||
|
|
|
|||
|
|
@ -2,16 +2,19 @@ import React, {createContext, FunctionComponent, useContext, useEffect, useState
|
|||
import ClientContext from "../providers/ClientContext";
|
||||
import KeyContext from "../providers/KeyContext";
|
||||
import {AccountInfo, ParsedAccountData, PublicKey, RpcResponseAndContext} from "@solana/web3.js";
|
||||
import {message} from "antd";
|
||||
import {BigNumber} from "ethers/utils";
|
||||
import {SlotContext} from "./SlotContext";
|
||||
import {TOKEN_PROGRAM} from "../config";
|
||||
import {BridgeContext} from "./BridgeContext";
|
||||
import {message} from "antd";
|
||||
import {AssetMeta} from "../utils/bridge";
|
||||
|
||||
export interface BalanceInfo {
|
||||
mint: string,
|
||||
account: PublicKey,
|
||||
balance: BigNumber,
|
||||
decimals: number
|
||||
decimals: number,
|
||||
assetMeta: AssetMeta
|
||||
}
|
||||
|
||||
export interface TokenInfo {
|
||||
|
|
@ -27,31 +30,47 @@ export const SolanaTokenContext = createContext<TokenInfo>({
|
|||
export const SolanaTokenProvider: FunctionComponent = ({children}) => {
|
||||
let k = useContext(KeyContext)
|
||||
let c = useContext(ClientContext);
|
||||
let b = useContext(BridgeContext);
|
||||
let slot = useContext(SlotContext);
|
||||
|
||||
let [loading, setLoading] = useState(true)
|
||||
let [accounts, setAccounts] = useState<Array<{ pubkey: PublicKey; account: AccountInfo<ParsedAccountData> }>>([]);
|
||||
let [balances, setBalances] = useState<Array<BalanceInfo>>([]);
|
||||
|
||||
useEffect(() => {
|
||||
// @ts-ignore
|
||||
setLoading(true)
|
||||
c.getParsedTokenAccountsByOwner(k.publicKey, {programId: new PublicKey(TOKEN_PROGRAM)},"single").then((res: RpcResponseAndContext<Array<{ pubkey: PublicKey; account: AccountInfo<ParsedAccountData> }>>) => {
|
||||
setAccounts(res.value)
|
||||
setLoading(false)
|
||||
}).catch(() => {
|
||||
setLoading(false)
|
||||
message.error("Failed to load token accounts")
|
||||
})
|
||||
}, [slot])
|
||||
// @ts-ignore
|
||||
setLoading(true)
|
||||
let getAccounts = async () => {
|
||||
try {
|
||||
let res: RpcResponseAndContext<Array<{ pubkey: PublicKey; account: AccountInfo<ParsedAccountData> }>> = await c.getParsedTokenAccountsByOwner(k.publicKey, {programId: new PublicKey(TOKEN_PROGRAM)}, "single")
|
||||
let meta: AssetMeta[] = [];
|
||||
for (let acc of res.value) {
|
||||
let am = await b?.fetchAssetMeta(new PublicKey(acc.account.data.parsed.info.mint))
|
||||
if (!am) {
|
||||
throw new Error("could not derive asset meta")
|
||||
}
|
||||
meta.push(am)
|
||||
}
|
||||
let balances: Array<BalanceInfo> = await res.value.map((v, i) => {
|
||||
return {
|
||||
mint: v.account.data.parsed.info.mint,
|
||||
account: v.pubkey,
|
||||
balance: new BigNumber(v.account.data.parsed.info.tokenAmount.amount),
|
||||
decimals: v.account.data.parsed.info.tokenAmount.decimals,
|
||||
assetMeta: meta[i],
|
||||
}
|
||||
})
|
||||
setBalances(balances)
|
||||
setLoading(false)
|
||||
} catch (e) {
|
||||
setLoading(false)
|
||||
message.error("Failed to load token accounts")
|
||||
}
|
||||
}
|
||||
getAccounts();
|
||||
},
|
||||
[slot]
|
||||
)
|
||||
|
||||
let balances: Array<BalanceInfo> = accounts.map((v) => {
|
||||
return {
|
||||
mint: v.account.data.parsed.info.mint,
|
||||
account: v.pubkey,
|
||||
balance: new BigNumber(v.account.data.parsed.info.tokenAmount.amount),
|
||||
decimals: v.account.data.parsed.info.tokenAmount.decimals
|
||||
}
|
||||
})
|
||||
return (
|
||||
<SolanaTokenContext.Provider value={{balances, loading}}>
|
||||
{children}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
import React from 'react'
|
||||
import Wallet from '@project-serum/sol-wallet-adapter'
|
||||
|
||||
const WalletContext = React.createContext<Wallet | undefined>(undefined);
|
||||
export default WalletContext
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
declare module '@project-serum/sol-wallet-adapter' {
|
||||
import EventEmitter = NodeJS.EventEmitter;
|
||||
import {PublicKey} from "@solana/web3.js";
|
||||
|
||||
export default class Wallet extends EventEmitter {
|
||||
public publicKey: PublicKey;
|
||||
|
||||
constructor(url: string, network: string);
|
||||
|
||||
async connect();
|
||||
async disconnect();
|
||||
}
|
||||
}
|
||||
|
|
@ -3,14 +3,14 @@ import {PublicKey, TransactionInstruction} from "@solana/web3.js";
|
|||
import BN from 'bn.js';
|
||||
import assert from "assert";
|
||||
// @ts-ignore
|
||||
import * as BufferLayout from 'buffer-layout';
|
||||
import * as BufferLayout from 'buffer-layout'
|
||||
|
||||
export interface AssetMeta {
|
||||
chain: number,
|
||||
address: Buffer
|
||||
}
|
||||
|
||||
const CHAIN_ID_SOLANA = 1;
|
||||
export const CHAIN_ID_SOLANA = 1;
|
||||
|
||||
class SolanaBridge {
|
||||
connection: solanaWeb3.Connection;
|
||||
|
|
@ -35,9 +35,9 @@ class SolanaBridge {
|
|||
]);
|
||||
|
||||
// @ts-ignore
|
||||
let configKey = (await solanaWeb3.PublicKey.findProgramAddress([Buffer.from("bridge"), this.programID.toBuffer()], this.programID))[0];
|
||||
let configKey = await this.getConfigKey();
|
||||
let seeds: Array<Buffer> = [Buffer.from("wrapped"), configKey.toBuffer(), Buffer.of(asset.chain),
|
||||
asset.address];
|
||||
padBuffer(asset.address, 32)];
|
||||
// @ts-ignore
|
||||
let wrappedKey = (await solanaWeb3.PublicKey.findProgramAddress(seeds, this.programID))[0];
|
||||
// @ts-ignore
|
||||
|
|
@ -47,7 +47,7 @@ class SolanaBridge {
|
|||
dataLayout.encode(
|
||||
{
|
||||
instruction: 5, // CreateWrapped instruction
|
||||
address: asset.address,
|
||||
address: padBuffer(asset.address, 32),
|
||||
chain: asset.chain,
|
||||
},
|
||||
data,
|
||||
|
|
@ -72,7 +72,7 @@ class SolanaBridge {
|
|||
payer: PublicKey,
|
||||
tokenAccount: PublicKey,
|
||||
mint: PublicKey,
|
||||
amount: number | u64,
|
||||
amount: BN,
|
||||
targetChain: number,
|
||||
targetAddress: Buffer,
|
||||
asset: AssetMeta,
|
||||
|
|
@ -85,16 +85,17 @@ class SolanaBridge {
|
|||
BufferLayout.blob(32, 'assetAddress'),
|
||||
BufferLayout.u8('assetChain'),
|
||||
BufferLayout.blob(32, 'targetAddress'),
|
||||
BufferLayout.seq(BufferLayout.u8(), 2),
|
||||
BufferLayout.u32('nonce'),
|
||||
]);
|
||||
|
||||
let nonceBuffer = Buffer.alloc(4);
|
||||
nonceBuffer.writeUInt32BE(nonce, 0);
|
||||
nonceBuffer.writeUInt32LE(nonce, 0);
|
||||
|
||||
// @ts-ignore
|
||||
let configKey = (await solanaWeb3.PublicKey.findProgramAddress([Buffer.from("bridge"), this.programID.toBuffer()], this.programID))[0];
|
||||
let seeds: Array<Buffer> = [Buffer.from("transfer"), configKey.toBuffer(), Buffer.of(asset.chain),
|
||||
asset.address, Buffer.of(targetChain), targetAddress, tokenAccount.toBuffer(),
|
||||
let configKey = await this.getConfigKey();
|
||||
let seeds: Array<Buffer> = [Buffer.from("transfer"), configKey.toBuffer(), new Buffer([asset.chain]),
|
||||
padBuffer(asset.address, 32), new Buffer([targetChain]), padBuffer(targetAddress, 32), tokenAccount.toBuffer(),
|
||||
nonceBuffer,
|
||||
];
|
||||
// @ts-ignore
|
||||
|
|
@ -104,17 +105,18 @@ class SolanaBridge {
|
|||
dataLayout.encode(
|
||||
{
|
||||
instruction: 1, // TransferOut instruction
|
||||
amount: amount,
|
||||
amount: padBuffer(new Buffer(amount.toArray()), 32),
|
||||
targetChain: targetChain,
|
||||
assetAddress: asset.address,
|
||||
assetAddress: padBuffer(asset.address, 32),
|
||||
assetChain: asset.chain,
|
||||
targetAddress: targetAddress,
|
||||
targetAddress: padBuffer(targetAddress, 32),
|
||||
nonce: nonce,
|
||||
},
|
||||
data,
|
||||
);
|
||||
|
||||
const keys = [
|
||||
{pubkey: this.programID, isSigner: false, isWritable: false},
|
||||
{pubkey: solanaWeb3.SystemProgram.programId, isSigner: false, isWritable: false},
|
||||
{pubkey: this.tokenProgram, isSigner: false, isWritable: false},
|
||||
{pubkey: tokenAccount, isSigner: false, isWritable: true},
|
||||
|
|
@ -122,16 +124,17 @@ class SolanaBridge {
|
|||
|
||||
{pubkey: transferKey, isSigner: false, isWritable: true},
|
||||
{pubkey: mint, isSigner: false, isWritable: false},
|
||||
{pubkey: payer, isSigner: true, isWritable: false},
|
||||
{pubkey: payer, isSigner: true, isWritable: true},
|
||||
];
|
||||
|
||||
//TODO replace chainID
|
||||
if (asset.chain == CHAIN_ID_SOLANA) {
|
||||
// @ts-ignore
|
||||
let custodyKey = (await solanaWeb3.PublicKey.findProgramAddress([Buffer.from("custody"), this.configKey.toBuffer(), mint.toBuffer()], this.programID))[0];
|
||||
keys.push({pubkey: custodyKey, isSigner: false, isWritable: true})
|
||||
}
|
||||
|
||||
console.log(data)
|
||||
|
||||
return new TransactionInstruction({
|
||||
keys,
|
||||
programId: this.programID,
|
||||
|
|
@ -144,7 +147,7 @@ class SolanaBridge {
|
|||
mint: PublicKey,
|
||||
): Promise<AssetMeta> {
|
||||
// @ts-ignore
|
||||
let configKey = (await solanaWeb3.PublicKey.findProgramAddress([Buffer.from("bridge"), this.programID.toBuffer()], this.programID))[0];
|
||||
let configKey = await this.getConfigKey();
|
||||
let seeds: Array<Buffer> = [Buffer.from("meta"), configKey.toBuffer(), mint.toBuffer()];
|
||||
// @ts-ignore
|
||||
let metaKey = (await solanaWeb3.PublicKey.findProgramAddress(seeds, this.programID))[0];
|
||||
|
|
@ -156,8 +159,8 @@ class SolanaBridge {
|
|||
}
|
||||
} else {
|
||||
const dataLayout = BufferLayout.struct([
|
||||
BufferLayout.blob(32, 'assetAddress'),
|
||||
BufferLayout.u8('assetChain'),
|
||||
BufferLayout.blob(32, 'assetAddress'),
|
||||
]);
|
||||
let wrappedMeta = dataLayout.decode(metaInfo?.data);
|
||||
|
||||
|
|
@ -167,6 +170,11 @@ class SolanaBridge {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
async getConfigKey(): Promise<PublicKey> {
|
||||
// @ts-ignore
|
||||
return (await solanaWeb3.PublicKey.findProgramAddress([Buffer.from("bridge")], this.programID))[0]
|
||||
}
|
||||
}
|
||||
|
||||
// Taken from https://github.com/solana-labs/solana-program-library
|
||||
|
|
@ -205,6 +213,46 @@ export class u64 extends BN {
|
|||
}
|
||||
}
|
||||
|
||||
function padBuffer(b: Buffer, len: number): Buffer {
|
||||
const zeroPad = Buffer.alloc(len);
|
||||
console.log(len - b.length)
|
||||
b.copy(zeroPad, len - b.length);
|
||||
return zeroPad;
|
||||
}
|
||||
|
||||
export class u256 extends BN {
|
||||
/**
|
||||
* Convert to Buffer representation
|
||||
*/
|
||||
toBuffer(): Buffer {
|
||||
const a = super.toArray().reverse();
|
||||
const b = Buffer.from(a);
|
||||
if (b.length === 32) {
|
||||
return b;
|
||||
}
|
||||
assert(b.length < 32, 'u256 too large');
|
||||
|
||||
const zeroPad = Buffer.alloc(32);
|
||||
b.copy(zeroPad);
|
||||
return zeroPad;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a u256 from Buffer representation
|
||||
*/
|
||||
static fromBuffer(buffer: number[]): u256 {
|
||||
assert(buffer.length === 32, `Invalid buffer length: ${buffer.length}`);
|
||||
return new BN(
|
||||
// @ts-ignore
|
||||
[...buffer]
|
||||
.reverse()
|
||||
.map(i => `00${i.toString(16)}`.slice(-2))
|
||||
.join(''),
|
||||
16,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Layout for a public key
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue