Extra currency optional (#85)

Trinketer22 · Trinketer22 · web-flow · commit a0f298f84451 · 2025-02-07T19:52:42.000+04:00
* Make extra currency optional for TonClient

* Toncenter as default endpoint for TonClient tests

---------

Co-authored-by: Trinketer22 &lt;trinketer22@localhost&gt;
diff --git a/src/client/TonClient.spec.ts b/src/client/TonClient.spec.ts
@@ -5,7 +5,7 @@ let describeConditional = process.env.TEST_CLIENTS ? describe : describe.skip;
 
 describeConditional('TonClient', () => {
     let client = new TonClient({
-        endpoint: 'https://mainnet.tonhubapi.com/jsonRPC',
+        endpoint: 'https://toncenter.com/api/v2/jsonRPC',
     });
     const testAddress = Address.parse('EQCD39VS5jcptHL8vMjEXrzGaRcCVYto7HUn4bpAOg8xqB2N');
 
@@ -43,6 +43,10 @@ describeConditional('TonClient', () => {
         console.log(info, shardInfo, wcShards);
     });
 
+    it('should check contract is deployed', async () => {
+        expect(await client.isContractDeployed(testAddress)).toBe(true);
+    });
+
     it('should get extra currency info', async () => {
         // EC is rolled out only in testned yet
         let testClient = new TonClient({
@@ -52,7 +56,7 @@ describeConditional('TonClient', () => {
         let testAddr = Address.parse("0:D36CFC9E0C57F43C1A719CB9F540ED87A694693AE1535B7654B645F52814AFD7");
 
         let res = await testClient.getContractState(testAddr);
-        let expectedEc =res.extra_currencies.find(e => e.id == 100)!;
+        let expectedEc = res.extra_currencies?.find(e => e.id == 100)!;
         expect(expectedEc).not.toBeUndefined();
         expect(BigInt(expectedEc.amount)).toBe(10000000n);
     });
diff --git a/src/client/TonClient.ts b/src/client/TonClient.ts
@@ -441,7 +441,7 @@ function createProvider(client: TonClient, address: Address, init: StateInit | n
                 throw Error('Unsupported state');
             }
 
-            if(state.extra_currencies.length > 0) {
+            if(state.extra_currencies && state.extra_currencies.length > 0) {
                 ecMap = {};
                 for(let ec of state.extra_currencies) {
                     ecMap[ec.id] = BigInt(ec.amount);
diff --git a/src/client/api/HttpApi.ts b/src/client/api/HttpApi.ts
@@ -24,11 +24,11 @@ const blockIdExt = z.object({
 
 const addressInformation = z.object({
     balance: z.union([z.number(), z.string()]),
-    extra_currencies: z.array(z.object({
+    extra_currencies: z.optional(z.array(z.object({
         '@type': z.literal("extraCurrency"),
         id: z.number(),
         amount: z.string()
-    })),
+    }))),
     state: z.union([z.literal('active'), z.literal('uninitialized'), z.literal('frozen')]),
     data: z.string(),
     code: z.string(),

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ function createProvider(client: TonClient, address: Address, init: StateInit \| n`
`441`	`441`	`throw Error('Unsupported state');`
`442`	`442`	`}`
`443`	`443`
`444`		`- if(state.extra_currencies.length > 0) {`
	`444`	`+ if(state.extra_currencies && state.extra_currencies.length > 0) {`
`445`	`445`	`ecMap = {};`
`446`	`446`	`for(let ec of state.extra_currencies) {`
`447`	`447`	`ecMap[ec.id] = BigInt(ec.amount);`