Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.prod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PAYER_KEYPAIR="op://Solana Dev/Solana Program Keys/devnet-authority"
M_MINT_KEYPAIR="op://Solana Dev/Solana Program Keys/mint-mainnet"
M_MINT_KEYPAIR="op://Solana Dev/Solana Program Keys/m-mint-mainnet-old"
WM_MINT_KEYPAIR="op://Solana Dev/Solana Program Keys/wm-mint"
M_MINT_MULTISIG_KEYPAIR="op://Solana Dev/Solana Program Keys/token-multisig"
RPC_URL="op://Solana Dev/Helius/prod rpc"
Expand Down
2 changes: 1 addition & 1 deletion dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@eslint/js": "^9.21.0",
"@m0-foundation/solana-m-api-sdk": "0.1.7",
"@m0-foundation/solana-m-api-sdk": "0.1.9",
"@m0-foundation/solana-m-sdk": "0.2.5",
"@reown/appkit": "^1.7.2",
"@reown/appkit-adapter-solana": "^1.7.2",
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/components/swap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const Swap = ({ mode }: { mode: SwapMode }) => {
try {
setIsLoading(true);

const quote = await ApiClient.swap.quote({
const quote = await ApiClient.transactions.quote({
inputMint: fromAsset.mint.toBase58(),
outputMint: toAsset.mint.toBase58(),
amount: new Decimal(debouncedAmount).mul(10 ** fromAsset.decimals).toString(),
Expand All @@ -170,7 +170,7 @@ export const Swap = ({ mode }: { mode: SwapMode }) => {
throw new Error('No wallet connected');
}

const swap = await ApiClient.swap.swap({
const swap = await ApiClient.transactions.swap({
quoteId: quote.quoteId,
userPublicKey: walletProvider.publicKey.toBase58(),
});
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"cli:dev": "op run --account mzerolabs.1password.com --env-file='./.env.dev' --no-masking -- ts-node services/cli/main.ts",
"cli:prod": "op run --account mzerolabs.1password.com --env-file='./.env.prod' -- ts-node services/cli/main.ts",
"cli:test": "op run --account mzerolabs.1password.com --env-file='./.env.dev' -- ts-node services/cli/test.ts",
"fb:dev": "op run --account mzerolabs.1password.com --env-file='./.env.dev' -- ts-node services/cli/fb.ts"
"fb:dev": "op run --account mzerolabs.1password.com --env-file='./.env.dev' -- ts-node services/cli/fb.ts",
"repl:prod": "cd services/repl && npm run build && clear && op run --no-masking --account mzerolabs.1password.com --env-file='../../.env.prod' -- node dist/cli.js"
},
"devDependencies": {
"ts-node": "~10.9.2",
Expand Down
437 changes: 424 additions & 13 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

service:
auth: false
base-path: /swap
base-path: /transactions
endpoints:
quote:
docs: Get swap quote
Expand All @@ -19,6 +19,7 @@ service:
outputMint: string
amount: string
slippageBps: optional<integer>
maxAccounts: optional<integer>
examples:
- query-parameters:
inputMint: So11111111111111111111111111111111111111112
Expand Down Expand Up @@ -48,8 +49,8 @@ service:
swap:
docs: Get swap transaction
method: GET
path: /transaction
response: Swap
path: /swap
response: Transaction
errors:
- QuoteNotFound
- SimulationFailed
Expand All @@ -64,8 +65,57 @@ service:
userPublicKey: 'D76ySoHPwD8U2nnTTDqXeUJQg5UkD9UD1PUE1rnvPAGm'
response:
body:
simulationLogs: []
transaction: 'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAGDkS+3LuGTbs......+/oD9qb31dH6i0QZ2IHELXUX3Y1YeW79p9Stkqk12z4yvZFJiQ4GCQwLBwYQBgUEDggNTQ=='
simulationLogs:
- Transaction successful
luts:
- 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
instructions:
- programId: 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
data: 3Bxs6mXg8fV7jXg5c6kUeXoGx5r4
keys:
- pubkey: 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
isSigner: false
isWritable: true

bridge:
docs: Get bridge transaction
method: GET
path: /bridge
response: Transaction
errors:
- BadBridgeRequest
- SimulationFailed
request:
name: GetBridgeRequest
query-parameters:
userPublicKey: string
fromChain: string
toChain: string
amount: string
recipientAddress: string
outboxItem: optional<string>
examples:
- query-parameters:
fromChain: 'Ethereum'
toChain: 'Solana'
amount: '1000000'
userPublicKey: 'D76ySoHPwD8U2nnTTDqXeUJQg5UkD9UD1PUE1rnvPAGm'
recipientAddress: '0x77BAB32F75996de8075eBA62aEa7b1205cf7E004'
response:
body:
transaction: 'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAGDkS+3LuGTbs......+/oD9qb31dH6i0QZ2IHELXUX3Y1YeW79p9Stkqk12z4yvZFJiQ4GCQwLBwYQBgUEDggNTQ=='
simulationLogs:
- Transaction successful
luts:
- 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
instructions:
- programId: 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
data: 3Bxs6mXg8fV7jXg5c6kUeXoGx5r4
keys:
- pubkey: 9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD
isSigner: false
isWritable: true

types:
Quote:
Expand Down Expand Up @@ -95,11 +145,29 @@ types:
feeAmount: string
feeMint: string

Swap:
Transaction:
properties:
transaction: string
instructions: list<Instruction>
luts: list<string>
simulationLogs: list<string>

Instruction:
properties:
programId: string
data: string
keys: list<AccountMeta>

AccountMeta:
properties:
pubkey: string
isSigner: boolean
isWritable: boolean

ErrorWithMessage:
properties:
message: string

SwapRequestError:
properties:
message: string
Expand All @@ -119,6 +187,10 @@ errors:
status-code: 400
type: SwapRequestError

SimulationFailed:
BadBridgeRequest:
status-code: 400
type: ErrorWithMessage

SimulationFailed:
status-code: 500
type: SwapRequestError
6 changes: 3 additions & 3 deletions services/api/sdk-go/client/client.go

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

71 changes: 47 additions & 24 deletions services/api/sdk-go/errors.go

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

Loading
Loading