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

Solana fixes after rebase from main

This commit is contained in:
skojenov 2022-05-16 14:05:52 +00:00 committed by Karl Kempe
parent fe58a17360
commit ce31e47b73
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/js/src/icco/__tests__/helpers.ts
View File

@ -70,8 +70,8 @@ import {
} from "./consts";
import { getSaleIdFromIccoVaa } from "../signedVaa";
import {
getAcceptedTokenDecimalsOnConductor,
normalizeConversionRate,
getAcceptedTokenDecimalsOnConductor,
} from "../misc";
const ERC20 = require("@openzeppelin/contracts/build/contracts/ERC20PresetMinterPauser.json");

10
sdk/js/src/icco/__tests__wip/solanacontract.ts
View File

@ -202,9 +202,11 @@ describe("Solana dev Tests", () => {
];
// we need to set up all of the accepted tokens (natives plus their wrapped versions)
const decimals = 9;
const acceptedTokens = await makeAcceptedTokensFromConfigs(
contributorConfigs,
buyers
buyers,
decimals // Single for all tokens?
);
const tokenAmount = "1";
@ -215,13 +217,17 @@ describe("Solana dev Tests", () => {
const saleStart =
(await makeSaleStartFromLastBlock(contributorConfigs)) + 20; // So it can be aborted "early".
const decimals = 9;
const saleEnd = saleStart + saleDuration;
console.info("--> Sale Start: ", saleStart);
const localTokenAddress = tokenAddress; // TBD. Local token may not be created yet.
const tokenChain = CHAIN_ID_ETH; // needed to check if token is native or not
const saleInitVaa = await createSaleOnEthAndGetVaa(
conductorConfig.wallet,
conductorConfig.chainId,
localTokenAddress,
tokenAddress,
tokenChain,
ethers.utils.parseUnits(tokenAmount, decimals),
ethers.utils.parseUnits(minRaise),
ethers.utils.parseUnits(maxRaise),

37
solana/modules/icco_contributor/program/src/messages.rs
View File

@ -101,7 +101,7 @@ impl DeserializePayload for SaleInit {
fn deserialize(buf: &mut &[u8]) -> Result<Self> {
let r = SaleInit {
payload_id: buf[0],
token_cnt: buf[227],
token_cnt: buf[228],
sale_id: read_u256(&buf[1..]).1,
};
Ok(r)
@ -115,11 +115,12 @@ impl DeserializePayload for SaleInit {
saleInit.saleID, 32b 1
saleInit.tokenAddress, 32b 33
saleInit.tokenChain, 2b 65
saleInit.tokenAmount, 32b 67
saleInit.minRaise, 32b 99
saleInit.maxRaise, 32b 131
saleInit.saleStart, 32b 163
saleInit.saleEnd, 32b 195
saleInit.tokenDecimals 1b 67
saleInit.tokenAmount, 32b
saleInit.minRaise, 32b
saleInit.maxRaise, 32b
saleInit.saleStart, 32b
saleInit.saleEnd, 32b
encodeTokens(saleInit.acceptedTokens), 227 + 50*tCnt
saleInit.recipient, 32b 228 + 50*tCnt
saleInit.refundRecipient 32b 260 + 50*tCnt
@ -153,50 +154,54 @@ impl SaleInit {
read_u16(&bf[65..])
}
pub fn get_token_decimals(bf: &[u8]) -> u8 {
bf[67]
}
pub fn get_token_amount(&self, bf: &[u8]) -> (u128, u128) {
read_u256(&bf[67..])
read_u256(&bf[68..])
}
pub fn get_min_raise(&self, bf: &[u8]) -> (u128, u128) {
read_u256(&bf[99..])
read_u256(&bf[100..])
}
pub fn get_max_raise(&self, bf: &[u8]) -> (u128, u128) {
read_u256(&bf[131..])
read_u256(&bf[132..])
}
pub fn get_sale_start(&self, bf: &[u8]) -> (u128, u128) {
read_u256(&bf[163..])
read_u256(&bf[164..])
}
pub fn get_sale_end(&self, bf: &[u8]) -> (u128, u128) {
read_u256(&bf[195..])
read_u256(&bf[196..])
}
pub fn get_sale_recepient(&self, bf: &[u8]) -> Pubkey {
let recipient_offset: usize = 228 + usize::from(self.token_cnt) * 50;
let recipient_offset: usize = 229 + usize::from(self.token_cnt) * 50;
Pubkey::new(&bf[recipient_offset..recipient_offset + 32])
}
pub fn get_refund_recepient(&self, bf: &[u8]) -> Pubkey {
let recipient_offset: usize = 260 + usize::from(self.token_cnt) * 50;
let recipient_offset: usize = 261 + usize::from(self.token_cnt) * 50;
Pubkey::new(&bf[recipient_offset + 32..recipient_offset + 64])
}
// Accepted tokens data getters
// tokenAddress: Pubkey,
pub fn get_accepted_token_address(&self, idx: u8, bf: &[u8]) -> Pubkey {
let t_offset: usize = 228 + (idx as usize) * 50;
let t_offset: usize = 229 + (idx as usize) * 50;
Pubkey::new(&bf[t_offset..t_offset + 32])
}
pub fn get_accepted_token_chain(&self, idx: u8, bf: &[u8]) -> u16 {
let t_offset: usize = 228 + (idx as usize) * 50 + 32;
let t_offset: usize = 229 + (idx as usize) * 50 + 32;
read_u16(&bf[t_offset..])
}
pub fn get_accepted_token_conversion_rate(&self, idx: u8, bf: &[u8]) -> u128 {
let t_offset: usize = 228 + (idx as usize) * 50 + 34;
let t_offset: usize = 229 + (idx as usize) * 50 + 34;
read_u128(&bf[t_offset..])
}
}