Skip to content

Commit

Permalink
Changed transfer methods. Added transfer tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
oable committed Nov 28, 2022
1 parent 6be5be7 commit c64f5f1
Show file tree
Hide file tree
Showing 41 changed files with 1,306 additions and 1,073 deletions.
5 changes: 3 additions & 2 deletions dist/core/InstructionService.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference types="node" />
import { AccountInfo, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
import { AccountInfo, Connection, PublicKey, SendOptions, TransactionInstruction } from '@solana/web3.js';
import Web3 from 'web3';
import { Account, TransactionConfig } from 'web3-core';
import { Contract } from 'web3-eth-contract';
Expand All @@ -14,6 +14,7 @@ export declare class InstructionService {
proxyStatus: NeonProgramStatus;
connection: Connection;
events: InstructionEvents;
solanaOptions: SendOptions;
constructor(options: InstructionParams);
get erc20ForSPLContract(): Contract;
get neonWrapperContract(): Contract;
Expand All @@ -26,6 +27,6 @@ export declare class InstructionService {
getAssociatedTokenAddress(mintPubkey: PublicKey, walletPubkey: PublicKey): Promise<PublicKey>;
approveDepositInstruction(walletPubkey: PublicKey, neonPDAPubkey: PublicKey, associatedTokenPubkey: PublicKey, amount: number | bigint): TransactionInstruction;
createApproveSolanaData(solanaWallet: PublicKey, splToken: SPLToken, amount: number): string;
getEthereumTransactionParams(amount: number, token: SPLToken): TransactionConfig;
ethereumTransaction(amount: number, token: SPLToken): TransactionConfig;
emitFunction: (functionName?: Function, ...args: any[]) => void;
}
4 changes: 3 additions & 1 deletion dist/core/InstructionService.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/core/InstructionService.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/core/MintPortal.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccountMeta, PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
import { Account, SignedTransaction, TransactionReceipt } from 'web3-core';
import { Account, SignedTransaction, TransactionConfig } from 'web3-core';
import { InstructionService } from './InstructionService';
import { SPLToken } from '../models';
export declare class MintPortal extends InstructionService {
Expand All @@ -16,7 +16,7 @@ export declare class MintPortal extends InstructionService {
}>;
makeTrExecFromDataIx(neonAddress: PublicKey, neonRawTransaction: string, neonKeys: AccountMeta[]): Promise<TransactionInstruction>;
getCollateralPoolAddress(collateralPoolIndex: number): Promise<[PublicKey, number]>;
createNeonTransaction(neonWallet: string, solanaWallet: PublicKey, splToken: SPLToken, amount: number): Promise<TransactionReceipt>;
createNeonTransaction(neonWallet: string, solanaWallet: PublicKey, splToken: SPLToken, amount: number): Promise<TransactionConfig>;
solanaTransferTransaction(walletPubkey: PublicKey, mintPubkey: PublicKey, associatedTokenPubkey: PublicKey): Promise<Transaction>;
createAssociatedTokenAccountInstruction(associatedProgramId: PublicKey, programId: PublicKey, mint: PublicKey, associatedAccount: PublicKey, owner: PublicKey, payer: PublicKey): TransactionInstruction;
}
42 changes: 21 additions & 21 deletions dist/core/MintPortal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c64f5f1

Please sign in to comment.