Skip to content

Commit 864d707

Browse files
authored
chore: update gno-js-client with deposit column (#756)
1 parent c997531 commit 864d707

File tree

14 files changed

+400
-249
lines changed

14 files changed

+400
-249
lines changed

packages/adena-extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
"webpack-merge": "5.10.0"
7676
},
7777
"dependencies": {
78-
"@adena-wallet/sdk": "0.0.2",
78+
"@adena-wallet/sdk": "0.0.10",
7979
"@bufbuild/protobuf": "2.2.3",
80-
"@gnolang/gno-js-client": "1.3.2",
80+
"@gnolang/gno-js-client": "1.4.1",
8181
"@gnolang/tm2-js-client": "1.3.0",
8282
"@tanstack/react-query": "4.36.1",
8383
"adena-module": "*",

packages/adena-extension/src/common/validation/validation-message.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ export const validateTransactionMessageOfAddPkg = (message: { [key in string]: a
7272
if (typeof message.value.creator !== 'string') {
7373
return false;
7474
}
75-
if (typeof message.value.max_deposit !== 'string') {
76-
return false;
77-
}
7875
if (typeof message.value.package !== 'object') {
7976
return false;
8077
}

packages/adena-extension/src/components/molecules/approve-transaction-message-box/approve-transaction-message-box.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React, { useMemo } from 'react';
22

3-
import { ContractMessage } from '@adena-wallet/sdk';
4-
53
import { GnoArgumentInfo } from '@inject/message/methods/gno-connect';
4+
import { ContractMessage } from '@inject/types';
65
import ApproveTransactionMessage from '../approve-transaction-message/approve-transaction-message';
76
import { ApproveTransactionMessageBoxWrapper } from './approve-transaction-message-box.styles';
87

packages/adena-extension/src/components/molecules/approve-transaction-message/approve-transaction-message.spec.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ describe('ApproveTransactionMessage Component', () => {
1919
caller: '',
2020
func: '',
2121
pkg_path: '',
22+
max_deposit: '',
2223
send: '',
2324
},
2425
},

packages/adena-extension/src/inject/message/command-handler.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ function makeTransactionMessage(
199199
pkg_path: gnoMessageInfo.packagePath,
200200
func: gnoMessageInfo.functionName,
201201
args: messageArguments,
202+
max_deposit: gnoMessageInfo.maxDeposit,
202203
},
203204
},
204205
];

packages/adena-extension/src/inject/message/methods/gno-connect.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export interface GnoMessageInfo {
1515
packagePath: string;
1616
functionName: string;
1717
send: string;
18+
maxDeposit: string;
1819
args: GnoArgumentInfo[] | null;
1920
}
2021

@@ -96,6 +97,7 @@ export function parseGnoMessageInfo(href: string): GnoMessageInfo | null {
9697
packagePath: '',
9798
functionName: '',
9899
send: '',
100+
maxDeposit: '',
99101
args: null,
100102
};
101103
const splitter = '$help';
@@ -134,6 +136,11 @@ export function parseGnoMessageInfo(href: string): GnoMessageInfo | null {
134136
continue;
135137
}
136138

139+
if (key === '.max_deposit') {
140+
messageInfo.maxDeposit = value || '';
141+
continue;
142+
}
143+
137144
args.push({
138145
index: argumentIndex,
139146
key,

packages/adena-extension/src/migrates/migrations/v011/storage-migration-v011.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ describe('serialized wallet migration V011', () => {
3333
const migration = new StorageMigration011();
3434
const result = await migration.up(mockData);
3535

36-
expect(result.data.CURRENT_CHAIN_ID).toEqual('test7');
37-
expect(result.data.CURRENT_NETWORK_ID).toEqual('test7');
36+
expect(result.data.CURRENT_CHAIN_ID).toEqual('test7.2');
37+
expect(result.data.CURRENT_NETWORK_ID).toEqual('test7.2');
3838
});
3939

4040
it('up password success', async () => {
@@ -58,8 +58,8 @@ describe('serialized wallet migration V011', () => {
5858
expect(wallet.accounts).toHaveLength(0);
5959
expect(wallet.keyrings).toHaveLength(0);
6060

61-
expect(result.data.CURRENT_CHAIN_ID).toEqual('test7');
62-
expect(result.data.CURRENT_NETWORK_ID).toEqual('test7');
61+
expect(result.data.CURRENT_CHAIN_ID).toEqual('test7.2');
62+
expect(result.data.CURRENT_NETWORK_ID).toEqual('test7.2');
6363
});
6464

6565
it('up failed throw error', async () => {

packages/adena-extension/src/migrates/migrations/v011/storage-migration-v011.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class StorageMigration011 implements Migration<StorageModelDataV011> {
8686

8787
private migrateCurrentChainId(currentChainId: CurrentChainIdModelV010): CurrentChainIdModelV011 {
8888
if (currentChainId === 'test6') {
89-
return 'test7';
89+
return 'test7.2';
9090
}
9191
return currentChainId;
9292
}
@@ -95,7 +95,7 @@ export class StorageMigration011 implements Migration<StorageModelDataV011> {
9595
currentNetworkId: CurrentNetworkIdModelV010,
9696
): CurrentNetworkIdModelV011 {
9797
if (currentNetworkId === 'test6') {
98-
return 'test7';
98+
return 'test7.2';
9999
}
100100
return currentNetworkId;
101101
}

packages/adena-extension/src/repositories/transaction/response/transaction-history-query-response.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,23 @@ export interface MsgRunValue {
3333
caller?: string;
3434
send?: string;
3535
package?: Package;
36+
max_deposit?: string;
3637
}
3738

3839
export interface MsgCallValue {
3940
caller?: string;
4041
send?: string;
4142
pkg_path?: string;
43+
max_deposit?: string;
4244
func?: string;
4345
args?: string[];
4446
}
4547

4648
export interface AddPackageValue {
4749
creator?: string;
48-
deposit?: string;
4950
package?: Package;
51+
send?: string;
52+
max_deposit?: string;
5053
}
5154

5255
export interface Package {

packages/adena-extension/src/resources/chains/chains.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[
22
{
3-
"id": "test7",
3+
"id": "test7.2",
44
"default": true,
55
"main": true,
6-
"chainId": "test7",
6+
"chainId": "test7.2",
77
"chainName": "Gno.land",
8-
"networkId": "test7",
8+
"networkId": "test7.2",
99
"networkName": "Testnet 7",
1010
"addressPrefix": "g",
11-
"rpcUrl": "https://test7.onbloc.xyz:443",
11+
"rpcUrl": "https://rpc.test7.testnets.gno.land:443",
1212
"indexerUrl": "https://test7.indexer.onbloc.xyz",
1313
"gnoUrl": "https://test7.testnets.gno.land",
1414
"apiUrl": "https://test7.api.onbloc.xyz",

0 commit comments

Comments
 (0)