@solana/rpc-graphql 2.0.0-experimental.fbd3974 → 2.0.0-experimental.fcff844

package/README.md

@@ -130,11 +130,12 @@ The `Account` interface contains common fields across all accounts.
 
 ```graphql
 interface Account {
-    encoding: String,
-    executable: Boolean,
-    lamports: BigInt,
-    owner: Account, # Interface
-    rentEpoch: BigInt,
+    address: String
+    encoding: String
+    executable: Boolean
+    lamports: BigInt
+    owner: Account
+    rentEpoch: BigInt
 }
 ```
 
@@ -202,14 +203,10 @@ const source = `
         account(address: $address) {
             ... on MintAccount {
                 data {
-                    parsed {
-                        info {
-                            decimals
-                            isInitialized
-                            mintAuthority
-                            supply
-                        }
-                    }
+                    decimals
+                    isInitialized
+                    mintAuthority
+                    supply
                 }
             }
         }
@@ -222,9 +219,7 @@ for (const address of maybeMintAddresses) {
         const {
             data: {
                 account: {
-                    data: {
-                        parsed: { info: mintInfo },
-                    },
+                    data: mintInfo,
                 },
             },
         } = result;
@@ -251,26 +246,22 @@ const source = `
         account(address: $address) {
             ... on MintAccount {
                 data {
-                    parsed {
-                        info {
-                            decimals
-                            isInitialized
-                            supply
-                        }
-                        type
-                    }
+                    decimals
+                    isInitialized
+                    supply
+                }
+                meta {
+                    type
                 }
             }
             ... on TokenAccount {
                 data {
-                    parsed {
-                        info {
-                            isNative
-                            mint
-                            state
-                        }
-                        type
-                    }
+                    isNative
+                    mint
+                    state
+                }
+                meta {
+                    type
                 }
             }
         }
@@ -283,11 +274,9 @@ for (const address of mintOrTokenAccountAddresses) {
         const {
             data: {
                 account: {
-                    data: {
-                        parsed: {
-                            info: accountParsedInfo,
-                            type: accountType,
-                        }
+                    data: accountParsedInfo,
+                    meta: {
+                        type: accountType,
                     }
                 }
             }
@@ -427,13 +416,9 @@ const source = `
             ... on MintAccount {
                 address
                 data {
-                    parsed {
-                        info {
-                            mintAuthority {
-                                address
-                                lamports
-                            }
-                        }
+                    mintAuthority {
+                        address
+                        lamports
                     }
                 }
             }
@@ -453,13 +438,9 @@ data: {
     account: {
         address: 'AyGCwnwxQMCqaU4ixReHt8h5W4dwmxU7eM3BEQBdWVca',
         data: {
-            parsed: {
-                info: {
-                    mintAuthority: {
-                        address: 'DpfJkNonoVB3sor9H9ceajhex4XHVPrDAGAq2ahdG4JZ',
-                        lamports: 10290815n,
-                    }
-                }
+            mintAuthority: {
+                address: 'DpfJkNonoVB3sor9H9ceajhex4XHVPrDAGAq2ahdG4JZ',
+                lamports: 10290815n,
             }
         },
     },
@@ -524,26 +505,24 @@ const source = `
         programAccounts(programAddress: $address) {
             ... on MintAccount {
                 data {
-                    parsed {
-                        info {
-                            decimals
-                            isInitialized
-                            mintAuthority
-                            supply
-                        }
-                    }
+                    decimals
+                    isInitialized
+                    mintAuthority
+                    supply
+                }
+                meta {
+                    type
                 }
             }
             ... on TokenAccount {
                 data {
-                    parsed {
-                        info {
-                            isNative
-                            mint
-                            owner
-                            state
-                        }
-                    }
+                    isNative
+                    mint
+                    owner
+                    state
+                }
+                meta {
+                    type
                 }
             }
         }
@@ -559,11 +538,9 @@ const result = await rpcGraphQL.query(source, variableValues);
 const { mints, tokenAccounts } = result.data.programAccounts.reduce(
   (acc: { mints: any[]; tokenAccounts: any[] }, account) => {
     const {
-        data: {
-            parsed: {
-                info: accountParsedInfo,
-                type: accountType,
-            }
+        data: accountParsedInfo,
+        meta: {
+            type: accountType,
         }
     } = account;
     if (accountType === "mint") {
@@ -639,13 +616,9 @@ const source = `
         programAccounts(programAddress: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA") {
             ... on TokenAccount {
                 data {
-                    parsed {
-                        info {
-                            owner {
-                                owner {
-                                    lamports
-                                }
-                            }
+                    owner {
+                        owner {
+                            lamports
                         }
                     }
                 }
@@ -657,7 +630,7 @@ const source = `
 const result = await rpcGraphQL.query(source);
 
 const sumOfAllLamportsOfOwnersOfOwnersOfTokenAccounts = result.data
-    .map(o => o.account.data.parsed.info.owner.owner.lamports)
+    .map(o => o.account.data.owner.owner.lamports)
     .reduce((acc, lamports) => acc + lamports, 0);
 ```
 
@@ -669,38 +642,13 @@ The `Transaction` interface contains common fields across all transactions.
 
 ```graphql
 interface Transaction {
-    blocktime: BigInt,
-    encoding: String,
-    meta: TransactionMeta, # Interface
-    slot: BigInt,
-}
-```
-
-Notice the `TransactionMetaInterface` type present in the transaction
-interface.
-
-```graphql
-interface TransactionMeta {
-    computeUnitsConsumed: BigInt,
-    err: String,
-    fee: BigInt,
-    format: String,
-    loadedAddresses: TransactionMetaLoadedAddresses,
-    logMessages: [String],
-    postBalances: [BigInt],
-    postTokenBalances: [TokenBalance],
-    preBalances: [BigInt],
-    preTokenBalances: [TokenBalance],
-    returnData: ReturnData,
-    rewards: [Reward],
-    status: TransactionStatus,
+    blockTime: String
+    encoding: String
+    meta: TransactionMeta
+    slot: BigInt
 }
 ```
 
-The `TransactionMeta` interface is required since the field `innerInstructions`
-will depend on the encoding level requested for the transaction. This also
-applies to the actual `transaction` object itself.
-
 Similar to account types, any transaction can be queried by these fields
 without specifying the specific transaction type or the transaction meta
 type.
@@ -773,28 +721,26 @@ Similar to accounts, transactions with encoded data are also supported.
 
 Specific instruction types can be used in the transaction's instructions. The
 default instruction if it cannot be parsed using `jsonParsed` is the JSON
-version dubbed `PartiallyDecodedInstruction`.
+version dubbed `GenericInstruction`.
 
 ```typescript
 const source = `
     query myQuery($signature: String!, $commitment: Commitment) {
         transaction(signature: $signature, commitment: $commitment) {
-            ... on TransactionJsonParsed {
-                transaction {
+            ... on TransactionParsed {
+                data {
                     message {
-                        ... on TransactionMessageParsed {
-                            accountKeys {
-                                pubkey
-                                signer
-                                source
-                                writable
-                            }
-                            instructions {
-                                ... on PartiallyDecodedInstruction {
-                                    accounts
-                                    data
-                                    programId
-                                }
+                        accountKeys {
+                            pubkey
+                            signer
+                            source
+                            writable
+                        }
+                        instructions {
+                            ... on GenericInstruction {
+                                accounts
+                                data
+                                programId
                             }
                         }
                     }
@@ -815,7 +761,7 @@ const result = await rpcGraphQL.query(source, variableValues);
 ```
 data: {
     transaction: {
-        transaction: {
+        data: {
             message: {
                 accountKeys: [
                     {
@@ -854,19 +800,17 @@ instructions, they can be queried using specific instruction types.
 const source = `
     query myQuery($signature: String!, $commitment: Commitment) {
         transaction(signature: $signature, commitment: $commitment) {
-            ... on TransactionJsonParsed {
-                transaction {
+            ... on TransactionParsed {
+                data {
                     message {
-                        ... on TransactionMessageParsed {
-                            instructions {
-                                ... on CreateAccountInstruction {
-                                    parsed {
-                                        info {
-                                            lamports
-                                            space
-                                        }
-                                        program
-                                    }
+                        instructions {
+                            ... on CreateAccountInstruction {
+                                data {
+                                    lamports
+                                    space
+                                }
+                                meta {
+                                    program
                                 }
                             }
                         }
@@ -888,15 +832,15 @@ const result = await rpcGraphQL.query(source, variableValues);
 ```
 data: {
     transaction: {
-        transaction: {
+        data: {
             message: {
                 instructions: [
                     {
-                        parsed: {
-                            info: {
-                                lamports: 890880n,
-                                space: 0n,
-                            },
+                        data: {
+                            lamports: 890880n,
+                            space: 0n,
+                        },
+                        meta: {
                             program: 'system',
                         },
                     }
@@ -923,7 +867,7 @@ const source = `
             encoding: $encoding,
         ) {
             ... on TransactionBase64 {
-                transaction
+                data
             }
         }
     }
@@ -941,7 +885,7 @@ const result = await rpcGraphQL.query(source, variableValues);
 ```
 data: {
     transaction: {
-        transaction: 'WzIsIDU0LCA5LCAgNzYsIDM1LCA2NCwgOCwgOCwgNCwgMywgMiwgNV0=',
+        data: 'WzIsIDU0LCA5LCAgNzYsIDM1LCA2NCwgOCwgOCwgNCwgMywgMiwgNV0=',
     },
 }
 ```
@@ -959,77 +903,59 @@ in the transaction response.
 const source = `
     query myQuery($signature: String!, $commitment: Commitment) {
         transaction(signature: $signature, commitment: $commitment) {
-            ... on TransactionJsonParsed {
-                transaction {
+            ... on TransactionParsed {
+                data {
                     message {
-                        ... on TransactionMessageParsed {
-                            instructions {
-                                ... on SplTokenTransferInstruction {
-                                    parsed {
-                                        info {
-                                            amount
-                                            authority {
+                        instructions {
+                            ... on SplTokenTransferInstruction {
+                                data {
+                                    amount
+                                    authority {
+                                        address
+                                        lamports
+                                    }
+                                    destination {
+                                        ... on TokenAccount {
+                                            data {
                                                 address
-                                                lamports
-                                            }
-                                            destination {
-                                                ... on TokenAccount {
-                                                    data {
-                                                        parsed {
-                                                            info {
-                                                                address
-                                                                mint {
-                                                                    ... on MintAccount {
-                                                                        data {
-                                                                            parsed {
-                                                                                info {
-                                                                                    address
-                                                                                    decimals
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
-                                                                owner {
-                                                                    address
-                                                                    lamports
-                                                                }
-                                                            }
+                                                mint {
+                                                    ... on MintAccount {
+                                                        data {
+                                                            address
+                                                            decimals
                                                         }
                                                     }
                                                 }
+                                                owner {
+                                                    address
+                                                    lamports
+                                                }
                                             }
-                                            source {
-                                                ... on TokenAccount {
-                                                    data {
-                                                        parsed {
-                                                            info {
-                                                                address
-                                                                mint {
-                                                                    ... on MintAccount {
-                                                                        data {
-                                                                            parsed {
-                                                                                info {
-                                                                                    address
-                                                                                    decimals
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
-                                                                owner {
-                                                                    address
-                                                                    lamports
-                                                                }
-                                                            }
+                                        }
+                                    }
+                                    source {
+                                        ... on TokenAccount {
+                                            data {
+                                                address
+                                                mint {
+                                                    ... on MintAccount {
+                                                        data {
+                                                            address
+                                                            decimals
                                                         }
                                                     }
                                                 }
+                                                owner {
+                                                    address
+                                                    lamports
+                                                }
                                             }
                                         }
-                                        program
                                     }
                                 }
+                                meta {
+                                    program
+                                }
                             }
                         }
                     }
@@ -1050,62 +976,50 @@ const result = await rpcGraphQL.query(source, variableValues);
 ```
 data: {
     transaction: {
-        transaction: {
+        data: {
             message: {
                 instructions: [
                     {
-                        parsed: {
-                            info: {
-                                amount: '50',
-                                authority: {
-                                    address: 'AHPPMhzDQix9sKULBqeaQ5BUZgrKdz8tg6DzPxsofB12',
-                                    lamports: 890880n,
-                                },
-                                destination: {
-                                    data: {
-                                        parsed: {
-                                            info: {
-                                                address: '2W8mUY75zxqwAcpirn75r3Cc7TStMirFyHwKqo13fmB1',
-                                                mint: data: {
-                                                    parsed: {
-                                                        info: {
-                                                            address: '8poKMotB2cEYVv5sbjrdyssASZj1vwYCe7GJFeXo2QP7',
-                                                            decimals: 6,
-                                                        }
-                                                    }
-                                                },
-                                                owner: {
-                                                    address: '7tRxJ2znbTFpwW9XaMMiDsXDudoPEUXRcpDpm8qjWgAZ',
-                                                    lamports: 890880n,
-                                                },
-                                            }
-                                        }
-                                    }
-                                },
-                                source: {
-                                    data: {
-                                        parsed: {
-                                            info: {
-                                                address: 'BqFCPqXUm4cq6jaZZx1TDTvUR1wdEuNNwAHBEVR6mJhM',
-                                                mint: data: {
-                                                    parsed: {
-                                                        info: {
-                                                            address: '8poKMotB2cEYVv5sbjrdyssASZj1vwYCe7GJFeXo2QP7',
-                                                            decimals: 6,
-                                                        }
-                                                    }
-                                                },
-                                                owner: {
-                                                    address: '3dPmVLMD7PC5faZNyJUH9WFrUxAsbjydJfoozwmR1wDG',
-                                                    lamports: e890880n,
-                                                },
-                                            }
+                        data: {
+                            amount: '50',
+                            authority: {
+                                address: 'AHPPMhzDQix9sKULBqeaQ5BUZgrKdz8tg6DzPxsofB12',
+                                lamports: 890880n,
+                            },
+                            destination: {
+                                data: {
+                                    address: '2W8mUY75zxqwAcpirn75r3Cc7TStMirFyHwKqo13fmB1',
+                                    mint: data: {
+                                        address: '8poKMotB2cEYVv5sbjrdyssASZj1vwYCe7GJFeXo2QP7',
+                                        decimals: 6,
+                                    },
+                                    owner: {
+                                        address: '7tRxJ2znbTFpwW9XaMMiDsXDudoPEUXRcpDpm8qjWgAZ',
+                                        lamports: 890880n,
+                                    },
+                                }
+                            },
+                            source: {
+                                data: {
+                                    parsed: {
+                                        info: {
+                                            address: 'BqFCPqXUm4cq6jaZZx1TDTvUR1wdEuNNwAHBEVR6mJhM',
+                                            mint: data: {
+                                                address: '8poKMotB2cEYVv5sbjrdyssASZj1vwYCe7GJFeXo2QP7',
+                                                decimals: 6,
+                                            },
+                                            owner: {
+                                                address: '3dPmVLMD7PC5faZNyJUH9WFrUxAsbjydJfoozwmR1wDG',
+                                                lamports: e890880n,
+                                            },
                                         }
                                     }
-                                },
+                                }
                             },
-                            program: 'spl-token',
                         },
+                        meta: {
+                            program: 'spl-token',
+                        }
                     }
                 ]
             },
@@ -1130,22 +1044,22 @@ const source = `
             blockhash
             parentSlot
             rewards {
-                //
+                commission
+                lamports
+                rewardType
             }
             transactions {
-                ... on TransactionJsonParsed {
-                    transaction {
+                ... on TransactionParsed {
+                    data {
                         message {
-                            ... on TransactionMessageParsed {
-                                instructions {
-                                    ... on CreateAccountInstruction {
-                                        parsed {
-                                            info {
-                                                lamports
-                                                space
-                                            }
-                                            program
-                                        }
+                            instructions {
+                                ... on CreateAccountInstruction {
+                                    data {
+                                        lamports
+                                        space
+                                    }
+                                    meta {
+                                        program
                                     }
                                 }
                             }
@@ -1184,20 +1098,22 @@ data: {
             }
         ],
         transactions: [
-            {
-                message: {
-                    instructions: [
-                        {
-                            parsed: {
-                                info: {
+            data: {
+                    {
+                    message: {
+                        instructions: [
+                            {
+                                data: {
                                     lamports: 890880n,
                                     space: 0n,
                                 },
-                                program: 'system',
-                            },
-                        }
-                    ]
-                },
+                                meta: {
+                                    program: 'system',
+                                },
+                            }
+                        ]
+                    },
+                }
             }
         ],
     },