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
16 changes: 2 additions & 14 deletions ironfish/src/rpc/routes/chain/followChainStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ export type FollowChainStreamResponse = {
head: {
sequence: number
}
block: RpcBlock & {
/**
* @deprecated this can be derived from the type
*/
main: boolean
}
block: RpcBlock
}

export const FollowChainStreamRequestSchema: yup.ObjectSchema<FollowChainStreamRequest> = yup
Expand All @@ -53,13 +48,7 @@ export const FollowChainStreamResponseSchema: yup.ObjectSchema<FollowChainStream
sequence: yup.number().defined(),
})
.defined(),
block: RpcBlockSchema.concat(
yup
.object({
main: yup.boolean().defined(),
})
.defined(),
),
block: RpcBlockSchema.defined(),
})
.defined()

Expand Down Expand Up @@ -127,7 +116,6 @@ routes.register<typeof FollowChainStreamRequestSchema, FollowChainStreamResponse
block: {
...blockHeaderResponse,
size: getBlockSize(block),
main: type === 'connected',
transactions,
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,101 @@
"type": "Buffer",
"data": "base64:AQEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAepVTeMyphE+Dmvdv859m2dMQqopA+nIkH09qGunrghCzoRxBdps9IIDlfH39QtiHhp97SNHCfTqE1g9NzSRkqP3xWkq3VmrbFuU5reysyp2tlNTHrXJEeo680JUvZz0y8nyarvJagg2y55Ly5Ksr7a22nIWlpH8S8mySAAtNndcC+yXm9kZy0Se8TXChHmnEaJ2Pnh1YPJyfAAMeo57jtSuyhkC2fSUVHSCgpDovuLaxs+iQpQI1EHQ9hbasZ9JQRsPtd8vbnnIM5xZF3rDvBBdOd39KwMNJqutHJmOzhjtXgA+Db+tm0PkTcdEKnr/1dXuftA85LOswTTTyDAPJL4yP4DLg8VkrzRkhDDbIivPRFLKywLfIA4ISpL3DeaJaBgAAAKbOD60mDV0zPRz5n/V9lw2ODZvNdC+cE6D2bCxV0I4be7e1ZmfoUfEC8BE1IJwcT5oBlYKGJSUZencPLOOQAgNzlQi8PbmE+VHWCcMP/pCCQSftBPi2OyPe2LCDVOaTB7brXwuPOGqR4gwOkwpMvbvScRPRPnbvuRuURkx8oMqJrTsvFiMuTsxT+dPxcoovGLBk56DZRM1TosxawnKIUW5AJRpqW14OrA0WAy1eFXT28boXeu7bgAcUMBJbbLQitwY9l0WGbBNvOh6qWKcJMobj9CV/P/UhyWiy2gBhjhuVL/3brjfS1IidJEcJ4SVZ1qEpHn8QpZYn+wsQCKGeKavHj32Tcs5fRI93riSgj4nswAwWaFgMu0WHvJATRbxMG7Zmlr5A2eg2MlRDrq3hTbN0gwRgMZRMrmgFTuc/9nDZoVayFiQLSBEBrwqx9ArNk2j0URLgvIB66tyswNdSoGKMr8eUN3+8aVX2IsA0EbueNA9rkTtNn9V1rD21EqxZBzJJkuoJz4Z2pDcW5N8EOQ6ENwzAuzJPA0K7G2CAK9c1Mp+c+Qx/1ZFmKXdcjCH6CZ7/KpfWvwFIllZiRZgYvQHbRn5PkVCAQTqWBQ8ay2H5j8TWTTd/lFUq9tJKAi54aLSYLgnEGV5sPV0gaNHeFw1/XpvHjW/AOSi6MKmGRemqSMdF9SEOOEi3poi8Ydx5hGXRVXVSMF9GUE3LPg78xHDSCFIWpqzBf+QcEin6sTiiutCovokCFlPnBaRFnRxbJPfsUPtqErgQBM7GXSrTtMY+gz3semfv07LG8H/ezalT/yMAAQ4wbXsf7WgEjziYFSTU3Dh/LqZMs1YdOaEHEsMLO4VPxuhYmAIAAAAAAAAA5Kosd4S6xL0QhBx+o9V4obrGTiYhw39fB10zaNQuzpD3jW88xqECq5UANLpmb5vS1q/N8w9mHRuPmltgjS88Ag=="
}
],
"Route wallet/burnAsset with valid parameters returns the asset identifier": [
{
"value": {
"encrypted": false,
"version": 4,
"id": "3fb00234-9ec0-47ea-a7fd-0d6b1f609e55",
"name": "test",
"spendingKey": "f8ce359e6fe4ce9cef54f83a4dd219078b4fda24e2b15557ecbaa8d754dd61ff",
"viewKey": "5785c58cbc6cb96bff9fa5933543fec52945bd19afc53e9655ace975063d6ac73dc1c119d0e84b58f7df8b6cb7ce4321343f4f3f79e1362d78496de5755ab9de",
"incomingViewKey": "ceddad21ecb8c2cb62c93790de336625d6115404cd893cc6d66e0619200ad505",
"outgoingViewKey": "040e8ef8def3ccc4f845554ad8e834277e938acaf24b8b7e2899e9ce10334f39",
"publicAddress": "d26ea8c2cb14d07016e27cd659569fe17aca68e8af8634857d89347c6f721c2c",
"createdAt": {
"sequence": 1,
"hash": {
"type": "Buffer",
"data": "base64:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
}
},
"scanningEnabled": true,
"proofAuthorizingKey": "77562e901bfb2612d07ff985b1c44b4884ec3f229738673c360804716453640b",
"ledger": false
},
"head": {
"hash": {
"type": "Buffer",
"data": "base64:R5HXrp+X3xAO8VWOhHctagm0N2I4goP3XG8goyqIqoY="
},
"sequence": 1
}
},
{
"header": {
"sequence": 2,
"previousBlockHash": "4791D7AE9F97DF100EF1558E84772D6A09B43762388283F75C6F20A32A88AA86",
"noteCommitment": {
"type": "Buffer",
"data": "base64:OVT6AHNgvJ4s8BSfEi6Mll9EdI20mSNFBvA0EgQIAGs="
},
"transactionCommitment": {
"type": "Buffer",
"data": "base64:PPVTWiZuFajECILXt90IeMwjN6y2UMYNzwLDIdX0sik="
},
"target": "9282972777491357380673661573939192202192629606981189395159182914949423",
"randomness": "0",
"timestamp": 1740172985532,
"graffiti": "0000000000000000000000000000000000000000000000000000000000000000",
"noteSize": 4,
"work": "0"
},
"transactions": [
{
"type": "Buffer",
"data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAAFUAkKqIaIZGAJqxOR6oea0YCfX1qcfhkWwaA2HGrO5SvOFaAgOLAmdjIKxCGHLB+3TrIoplZbc1UHmN53eFIDjd0jzjLEAM1Q0y1vbhgBPiWGH3eI73QLrYWdvIFhrUvxmHNylnW+vo/VgI4pQRURRqdTjMCZy8N7O5Ujzp05tgJGSa04oAmCjtTaeuwzQ9dd/WxEBpYWIbZ0JrVBN0O1gRReYIDr4Mr8334LQ2MKJqzf9jJdz4RtKry+CQP7zz7tdADJEPm5ZcQ4sVmIEs9jGmJ8xV9aLWYunObWVAljlkPDLBB3I4mArz0f2kdtRYqSha7FtKnCOIEH9QZTI6N6QrDtUR1sTiznMPaaSbDdCtSHGb9uOYnUf1EeVW4aw9TP5vrs+55gCcTKen4zWWlplKaUqLaZl+CCwNbBwb0M5HCDT1ZZTkseGwLICLjKCGf/45ytLtZWl1LvsUmZ31wsipDRBaql46/C8MZwIJJey4GdVfSC9W6Y/gSGVxx0EHIkZPYudl7oxLJ4FOnaPBm1lwAGBR226CmK14msWXpp9/dPQZoXO4XMI5kj3rhpiXLBC8LWua87X9ysmahuwmd6S8dqDH25EtO7rH5uthc5ZE0eXvc2a9orUlyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNhqjwcaa++LgM3bS2Pqxcz6ezic+eA0DTwxImUfa1LiFH+3Er77x4qatRqO+pv0B6vnIN8jLeC1derhDkmEZDg=="
}
]
},
{
"type": "Buffer",
"data": "base64:AQAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvhc+LFqGiOgnQ5382R6eXo+OWxIESjXqucBUUJkvZ8aRWXS8TXJegyePnzEBTCzCZIUZefczNQRmOjyhM9+KsHHwwHvA3EJuCn60SorUJsqjNlTQRPd1B12J7FDZyiD3KVI8O6Hr9HN/nbfSeQV3wVDcXcSj4tzBYU28UEffQIwUySw/kzVvHuwPum/X06w2dpZ7PzLSOeyl0ku9JibMGlF0KewZJpn5PPrey2dfMi6t80TaFfzpccacZ6H5DmiO7L3LuWGlqueXqIa5JE2psQjmmevFxNS786YXtrhbzIGh4t/1sYk7tVkPRzzPQtXeV7biwtOh/ZBlpuh4rCnql/pfM/pB9pYvtdyfW0cDQv4ti0C2Z44XlcYwOGoopR8a0dYOruIdGTcXSmK1MopZNzUTrM0hWfhLggXesrHeKFvCjVxb8OASXrHjUtkgFnLZ1mBJuPl9C10Me4rnXm0/jLMmUczDXNe7YRiunPG/9FSwKvR7lUrIvvACtpbWxh4Huh75fbbAtASGyjheZVK7rjsjGP9DjwWR99KCN5XsLsHmIamGVG/khz0+oI0TcSnldkQ4UZpgyS5cyXGyCfuVoYH9xULxI0+g6GMTWy7/oSGxcJCyPSLrgWaltf2lQE8uGc91IfJHn/5xkx7fuw+MDTYHteuHh8yknWUSo3UmTiwcfrETKfU0bOLS45Zcl2kSlrJR/XLM40Xy1S9VWK/I6COa5jzATdCshXB+iy7dg7qWizB7wwG9GrI4xW1N+H+K91m1jnVKWUdJFwRNEeUraycVETk/+td6ikO2Bu9SoVY2xJR1z89qZe86+oWiz8SWU0i6epSxenZ3QoT0h25JB29rME2/xwKJD6AZdHT1k9kiKS3YF8o43kHvtryIvArY9MdnOH1UXOtIkpxUySLa+XyNTnaaUGnYj4fjhauMiqHUUmF3MXpUTSfKOv+UDWZG6xtkUbF0LPw3x2ShH7D7LWBXrv5QtJ3I0m6owssU0HAW4nzWWVaf4XrKaOivhjSFfYk0fG9yHCxtaW50LWFzc2V0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1ldGFkYXRhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAADrWAJxu8oYTBIuFE1Y+Vx+LszIdhkLN2D0JMDlSILeveQF3763aRrO+qTX9k8aHrZmZSyyWnPV8X+NDxLrXNgzOWjLO/EtIHeRO/QI/xfyj4bm260FJycquelrPnrivPlLDij9k3FyaJ3nQ6MOIs4+HlG2An7IcDpuvCxjhX/0H"
},
{
"header": {
"sequence": 3,
"previousBlockHash": "2A3DB03A56F752F951C45CE17620986175AA70BCDFD79AF95012591ADEF5F587",
"noteCommitment": {
"type": "Buffer",
"data": "base64:GHpeyUv53UZJrG52l94GKTXJZPA2RBudSHreVMfwHS8="
},
"transactionCommitment": {
"type": "Buffer",
"data": "base64:+k7pxvA6HH/1E2Bfupr4NC0cJJ7qVmWEiDVE1pvsyWU="
},
"target": "9255858786337818395603165512831024101510453493377417362192396248796027",
"randomness": "0",
"timestamp": 1740172986506,
"graffiti": "0000000000000000000000000000000000000000000000000000000000000000",
"noteSize": 6,
"work": "0"
},
"transactions": [
{
"type": "Buffer",
"data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAAc0IR2sxz/v/fS9liqY76GNTXhbL3dvheUYU3dHpQqOOImCenkiAbS9BlLzAi1hPCQdJeOiiR/oPCnuGeb6BDyjFTJdy+ixLsf8XX5p5JjVG1INOh7tfFicTg+FwEQGcn+TTNXgzUEsgiZjLoK2RR8jIWu8fXyxmzYD9mMscAOf8ELqgVVJMNXo6VYM9w863IpSRUEuDgVxCCHusc+1I4BheU3vwU3iumdQN/boZ4AE+yZ7HH5DIvDvp6sG0kpUMLc8GHc9RIqPaaomrXsLo+V82mDFJ9Vg8TnGiqAhq4r2AAleaGq1Peg2uBrHMyhEgnxcMmxbASGrjJmPFjaHc6YgWaPVcqyLV/N5n1QZKgij+aTNaqRwWxYE+TE5x04AdMt7PDxmEAvtHQq3RcGsiumH25NIVpHXjnvfUzRC1B+sav53ES7EfoBuO1FqAhCfCoWh/2iyjbQ18eOFvbsmWiJDBRuzqfag4iL6cQmD9UFtVGqsgTb+bTxSpJWY3zBghjufrsE3CXt7MTETxLkKY7yaURoWKPg3oTYRwLzbhud+OhMMvnKFH6Kze1ZhuxpMtqz2JD5KLteJfcEPCTJtQ4XnrzvRfnS7ZoOQg8I9DGLg52JkrXz1rPN0lyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwVpeomoPF3I97PIf44/70zWZWuZf3SL8eo32I97HIFwSiFYTsXHBg0K6cRS6GRes9jCThmfX5FWHc7daf+IKYBA=="
},
{
"type": "Buffer",
"data": "base64:AQAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvhc+LFqGiOgnQ5382R6eXo+OWxIESjXqucBUUJkvZ8aRWXS8TXJegyePnzEBTCzCZIUZefczNQRmOjyhM9+KsHHwwHvA3EJuCn60SorUJsqjNlTQRPd1B12J7FDZyiD3KVI8O6Hr9HN/nbfSeQV3wVDcXcSj4tzBYU28UEffQIwUySw/kzVvHuwPum/X06w2dpZ7PzLSOeyl0ku9JibMGlF0KewZJpn5PPrey2dfMi6t80TaFfzpccacZ6H5DmiO7L3LuWGlqueXqIa5JE2psQjmmevFxNS786YXtrhbzIGh4t/1sYk7tVkPRzzPQtXeV7biwtOh/ZBlpuh4rCnql/pfM/pB9pYvtdyfW0cDQv4ti0C2Z44XlcYwOGoopR8a0dYOruIdGTcXSmK1MopZNzUTrM0hWfhLggXesrHeKFvCjVxb8OASXrHjUtkgFnLZ1mBJuPl9C10Me4rnXm0/jLMmUczDXNe7YRiunPG/9FSwKvR7lUrIvvACtpbWxh4Huh75fbbAtASGyjheZVK7rjsjGP9DjwWR99KCN5XsLsHmIamGVG/khz0+oI0TcSnldkQ4UZpgyS5cyXGyCfuVoYH9xULxI0+g6GMTWy7/oSGxcJCyPSLrgWaltf2lQE8uGc91IfJHn/5xkx7fuw+MDTYHteuHh8yknWUSo3UmTiwcfrETKfU0bOLS45Zcl2kSlrJR/XLM40Xy1S9VWK/I6COa5jzATdCshXB+iy7dg7qWizB7wwG9GrI4xW1N+H+K91m1jnVKWUdJFwRNEeUraycVETk/+td6ikO2Bu9SoVY2xJR1z89qZe86+oWiz8SWU0i6epSxenZ3QoT0h25JB29rME2/xwKJD6AZdHT1k9kiKS3YF8o43kHvtryIvArY9MdnOH1UXOtIkpxUySLa+XyNTnaaUGnYj4fjhauMiqHUUmF3MXpUTSfKOv+UDWZG6xtkUbF0LPw3x2ShH7D7LWBXrv5QtJ3I0m6owssU0HAW4nzWWVaf4XrKaOivhjSFfYk0fG9yHCxtaW50LWFzc2V0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1ldGFkYXRhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAADrWAJxu8oYTBIuFE1Y+Vx+LszIdhkLN2D0JMDlSILeveQF3763aRrO+qTX9k8aHrZmZSyyWnPV8X+NDxLrXNgzOWjLO/EtIHeRO/QI/xfyj4bm260FJycquelrPnrivPlLDij9k3FyaJ3nQ6MOIs4+HlG2An7IcDpuvCxjhX/0H"
}
]
},
{
"type": "Buffer",
"data": "base64:AQEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAA8MWm/WLh4/Y195LFy/0gFroQjIfIaV6vb9z/RK35dLOXskotJ4CXmtYGWG0eVxiJ1vleeIpTaFbDwKVApCNrTGikKglAmFXa6BPeU+3pDuejl+QloRrvkSifIHGTv9c0fuO2AUOTc1FUi9sCjSUYhYs3Vy+w3IJE0EBVemXraYQCpHoMZl9JyC8jesPtf70VdvyGNrea8laC5eAEM1xMRSNjUvmy768Hemj7VhTs12CVWPknlbZsU+L5jev27zHTGHJN0CXmjUabMXPbu5zinatL5+TK5N7Wlpu1+ZTy5OFvN8sOzTBQ6We2t1jD6WnCK/Whb2t7dzJHu01/ePALwxh6XslL+d1GSaxudpfeBik1yWTwNkQbnUh63lTH8B0vBgAAAL790Tf85VH+hYz6G3341Albdq2GxPeUXiGSv8SgItM5xR3Cvpz8kSdigWUVFsddIM8hFzv35NJkHhTAza5Nw7acTnRFyusLxKcyLIgkDSETR7kTZEoWV1VeGopLeYt0AJJy7ptYswq8fppmFupkEyExn7l49DilSe4e2hhTiaEV9SBM0vkQ7RDYWi8qJiWMtpKyY5pAlmOGx6rT6byb18HOmRXrvb/BFbO0Zkl0+nhy0FHbBY5aiyZxjd67ZglX2wH3tg71Tbt5KjN2temO4J0o+urt3HPzhiCgOcdm7sP4TNoYUYHq//tIdCPQA8gEu7BDeSm3hFHTBCodqz7WWUqTA2aB1qTOyQuvDkI0IqKS/SI0qnELzseBGESmPljxTnJ36dt5DkZfX45SJ7C5N8RfHP/o7i/lIfESx8/0+vtub8qCFZjOqjVKbeQWwv+LtY+oWndPrHH9zvGnICfNaW1eL3+XONswm0jSdUiSl83dnnKuUO1u3K278+4dGM3eRjEdNUPUKehNKfu3mimC3D4jIHfqd+s1LqA6OHy0g1GIYdWdjulrHZTi6n9HnTljROw3BXRRKoqb+icsBmWqs6D+ZOcRkiODhLO7xS7Mo9IRIGKDuQFW1/YS21oGlxF2ZHxtx5cO1iYiM4/DTNFOKnKqUb5eSmqu+loaZfvILCjWCPJRK6djdvNb3r5dirTUquBt1QR8fjJK7sD5X6LDNuywUh4YU4J6op6qc/b3Jz+AmFD/jy268maRKHE21qy7ya0ZcrjllK/C+u5hf3p0YgBxn/WZcNu/ZtvgT+uKpFbmU4UcUx7VH/yCQBEuyVuATbdHcNKeKcimcILJlpeZ9vdJQqSGXEb6ewIAAAAAAAAAVSXBxujVPmnR1CFSOFJIF1LNFNh9X+njrgxayhe1LGYroTxnq6A5KogrFKXh23eV5+m1DMb4BELt4KRu5HcWAQ=="
}
]
}
4 changes: 1 addition & 3 deletions ironfish/src/rpc/routes/wallet/burnAsset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Route wallet/burnAsset', () => {
})

describe('with valid parameters', () => {
it('returns the asset identifier and transaction hash', async () => {
it('returns the asset identifier', async () => {
const node = routeTest.node
const wallet = node.wallet
const account = await useAccountFixture(wallet)
Expand Down Expand Up @@ -112,9 +112,7 @@ describe('Route wallet/burnAsset', () => {
),
id: asset.id().toString('hex'),
assetId: asset.id().toString('hex'),
name: asset.name().toString('hex'),
assetName: asset.name().toString('hex'),
hash: burnTransaction.hash().toString('hex'),
value: burnTransaction.burns[0].value.toString(),
})
})
Expand Down
12 changes: 0 additions & 12 deletions ironfish/src/rpc/routes/wallet/burnAsset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ export const BurnAssetRequestSchema: yup.ObjectSchema<BurnAssetRequest> = yup
export type BurnAssetResponse = RpcBurn & {
asset: RpcAsset
transaction: RpcWalletTransaction
/**
* @deprecated Please use `transaction.hash` instead
*/
hash: string
/**
* @deprecated Please use `asset.name` instead
*/
name: string
}

export const BurnAssetResponseSchema: yup.ObjectSchema<BurnAssetResponse> =
Expand All @@ -54,8 +46,6 @@ export const BurnAssetResponseSchema: yup.ObjectSchema<BurnAssetResponse> =
.object({
asset: RpcAssetSchema.defined(),
transaction: RpcWalletTransactionSchema.defined(),
name: yup.string().defined(),
hash: yup.string().defined(),
})
.defined(),
).defined()
Expand Down Expand Up @@ -120,8 +110,6 @@ routes.register<typeof BurnAssetRequestSchema, BurnAssetResponse>(
),
id: burn.assetId.toString('hex'),
assetId: burn.assetId.toString('hex'),
hash: transaction.hash().toString('hex'),
name: asset.name.toString('hex'),
assetName: asset.name.toString('hex'),
value: CurrencyUtils.encode(burn.value),
})
Expand Down
59 changes: 0 additions & 59 deletions ironfish/src/rpc/routes/wallet/getBalance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ describe('Route wallet/getBalance', () => {
assetName: Buffer.from('$IRON', 'utf8'),
assetCreator: Buffer.from('Iron Fish', 'utf8'),
assetOwner: Buffer.from('Copper Clam', 'utf8'),
assetVerification: { status: 'unknown' },
confirmed: BigInt(2000000000),
unconfirmed: BigInt(2000000000),
pending: BigInt(2000000000),
Expand All @@ -52,7 +51,6 @@ describe('Route wallet/getBalance', () => {
expect(response.content).toEqual({
account: account.name,
assetId: Asset.nativeId().toString('hex'),
assetVerification: { status: 'unknown' },
confirmed: '2000000000',
unconfirmed: '2000000000',
pending: '2000000000',
Expand Down Expand Up @@ -81,7 +79,6 @@ describe('Route wallet/getBalance', () => {
assetName: asset.name(),
assetCreator: asset.creator(),
assetOwner: asset.creator(),
assetVerification: { status: 'unknown' },
confirmed: BigInt(8),
unconfirmed: BigInt(8),
pending: BigInt(8),
Expand All @@ -103,7 +100,6 @@ describe('Route wallet/getBalance', () => {
expect(response.content).toEqual({
account: account.name,
assetId: asset.id().toString('hex'),
assetVerification: { status: 'unknown' },
confirmed: '8',
unconfirmed: '8',
pending: '8',
Expand All @@ -116,60 +112,5 @@ describe('Route wallet/getBalance', () => {
sequence: null,
})
})

it('returns asset verification information', async () => {
const node = routeTest.node
const wallet = node.wallet
const account = await useAccountFixture(wallet, 'accountC')

const getBalances = jest
.spyOn(wallet, 'getBalance')
// eslint-disable-next-line @typescript-eslint/require-await
.mockImplementationOnce(async (_account, _assetId, _options?) => {
return {
assetId: Asset.nativeId(),
assetName: Buffer.from('$IRON', 'utf8'),
assetCreator: Buffer.from('Iron Fish', 'utf8'),
assetOwner: Buffer.from('Copper Clam', 'utf8'),
assetVerification: { status: 'unknown' },
confirmed: BigInt(2000000000),
unconfirmed: BigInt(2000000000),
pending: BigInt(2000000000),
available: BigInt(2000000000),
availableNoteCount: 1,
unconfirmedCount: 0,
pendingCount: 0,
blockHash: null,
sequence: null,
}
})

const verifyAsset = jest
.spyOn(node.assetsVerifier, 'verify')
.mockReturnValueOnce({ status: 'verified', symbol: 'FOO' })

const response = await routeTest.client.wallet.getAccountBalance({
account: account.name,
})

expect(getBalances).toHaveBeenCalledWith(account, Asset.nativeId(), { confirmations: 0 })
expect(verifyAsset).toHaveBeenCalledWith(Asset.nativeId())

expect(response.content).toEqual({
account: account.name,
assetId: Asset.nativeId().toString('hex'),
assetVerification: { status: 'verified' },
confirmed: '2000000000',
unconfirmed: '2000000000',
pending: '2000000000',
available: '2000000000',
availableNoteCount: 1,
unconfirmedCount: 0,
pendingCount: 0,
blockHash: null,
confirmations: 0,
sequence: null,
})
})
})
})
9 changes: 0 additions & 9 deletions ironfish/src/rpc/routes/wallet/getBalance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
import { Asset } from '@ironfish/rust-nodejs'
import * as yup from 'yup'
import { AssetVerification } from '../../../assets'
import { ApiNamespace } from '../namespaces'
import { routes } from '../router'
import { AssertHasRpcContext } from '../rpcContext'
Expand All @@ -30,10 +29,6 @@ export type GetBalanceResponse = {
confirmations: number
blockHash: string | null
sequence: number | null
/**
* @deprecated Please use getAsset endpoint to get this information
* */
assetVerification: { status: AssetVerification['status'] }
}

export const GetBalanceRequestSchema: yup.ObjectSchema<GetBalanceRequest> = yup
Expand All @@ -48,9 +43,6 @@ export const GetBalanceResponseSchema: yup.ObjectSchema<GetBalanceResponse> = yu
.object({
account: yup.string().defined(),
assetId: yup.string().defined(),
assetVerification: yup
.object({ status: yup.string().oneOf(['verified', 'unverified', 'unknown']).defined() })
.defined(),
unconfirmed: yup.string().defined(),
unconfirmedCount: yup.number().defined(),
pending: yup.string().defined(),
Expand Down Expand Up @@ -86,7 +78,6 @@ routes.register<typeof GetBalanceRequestSchema, GetBalanceResponse>(
request.end({
account: account.name,
assetId: assetId.toString('hex'),
assetVerification: { status: node.assetsVerifier.verify(assetId).status },
confirmed: balance.confirmed.toString(),
unconfirmed: balance.unconfirmed.toString(),
unconfirmedCount: balance.unconfirmedCount,
Expand Down
Loading