Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 6fcb91b

Browse files
author
Sébastien Dan
authored
feat: update code to fit unique token symbol (#36)
1 parent 2da7342 commit 6fcb91b

File tree

7 files changed

+21
-27
lines changed

7 files changed

+21
-27
lines changed

package-lock.json

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@opentelemetry/exporter-trace-otlp-proto": "^0.45.0",
2929
"@opentelemetry/sdk-metrics": "^1.17.1",
3030
"@opentelemetry/sdk-trace-web": "^1.17.1",
31-
"@topos-protocol/topos-smart-contracts": "^2.0.0",
31+
"@topos-protocol/topos-smart-contracts": "^3.0.0",
3232
"@types/event-source-polyfill": "^1.0.1",
3333
"antd": "^5.4.0",
3434
"axios": "^1.0.0",

packages/frontend/src/components/steps/Step2.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const Step2 = ({ onFinish }: StepProps) => {
229229

230230
return sendToken(
231231
receivingSubnet?.id,
232-
token?.addr,
232+
token?.symbol,
233233
recipientAddress,
234234
parsedAmount
235235
)

packages/frontend/src/hooks/useCheckTokenOnReceivingSubnet.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ const providerSpy = vi
3535
.spyOn(ethers.providers, 'WebSocketProvider')
3636
.mockReturnValue({ getCode: getCodeMock } as any)
3737

38-
const getTokenByAddressMock = vi.fn().mockResolvedValue(tokenMock)
38+
const getTokenBySymbolMock = vi.fn().mockResolvedValue(tokenMock)
3939

4040
const contractConnectMock = vi.fn().mockReturnValue({
41-
getTokenByAddress: getTokenByAddressMock,
41+
getTokenBySymbol: getTokenBySymbolMock,
4242
})
4343

4444
const contractMock = {
@@ -65,7 +65,7 @@ describe('useCheckTokenOnReceivingSubnet', () => {
6565
expect(contractSpy).toHaveBeenCalled()
6666
expect(getCodeMock).toHaveBeenCalledWith(contractMock.address)
6767
expect(contractConnectMock).toHaveBeenCalled()
68-
expect(getTokenByAddressMock).toHaveBeenCalledWith(tokenMock.addr)
68+
expect(getTokenBySymbolMock).toHaveBeenCalledWith(tokenMock.symbol)
6969
})
7070
})
7171
})

packages/frontend/src/hooks/useCheckTokenOnReceivingSubnet.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default function useCheckTokenOnSubnet() {
3636
const contract = erc20MessagingContract.connect(subnetProvider)
3737

3838
const onChainToken = await contract
39-
.getTokenByAddress(token.addr)
39+
.getTokenBySymbol(token.symbol)
4040
.finally(() => {
4141
setLoading(false)
4242
})

packages/frontend/src/hooks/useSendToken.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ describe('sendToken', () => {
3434
const { result } = renderHook(() => useSendToken())
3535

3636
const receivingSubnetId = 'receiving'
37-
const tokenAddress = 'tokenAddr'
37+
const tokenSymbol = 'tokenSymbol'
3838
const recipientAddress = 'receivingAddr'
3939
const amount = BigNumber.from(1)
4040

4141
await act(() => {
4242
result.current
43-
.sendToken(receivingSubnetId, tokenAddress, recipientAddress, amount)
43+
.sendToken(receivingSubnetId, tokenSymbol, recipientAddress, amount)
4444
.then(() => {
4545
expect(result.current.loading).toBe(true)
4646
expect(sendTokenMock).toHaveBeenCalledWith(
4747
receivingSubnetId,
48-
tokenAddress,
48+
tokenSymbol,
4949
recipientAddress,
5050
amount,
5151
{ gasLimit: 4_000_000 }

packages/frontend/src/hooks/useSendToken.ts

+4-10
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,17 @@ export default function useSendToken() {
2323
const sendToken = useCallback(
2424
(
2525
receivingSubnetId: string,
26-
tokenAddress: string,
26+
tokenSymbol: string,
2727
recipientAddress: string,
2828
amount: BigNumber
2929
) =>
3030
new Promise<SendTokenOutput>((resolve, reject) => {
3131
setLoading(true)
3232

3333
contract
34-
.sendToken(
35-
receivingSubnetId,
36-
tokenAddress,
37-
recipientAddress,
38-
amount,
39-
{
40-
gasLimit: 4_000_000,
41-
}
42-
)
34+
.sendToken(receivingSubnetId, tokenSymbol, recipientAddress, amount, {
35+
gasLimit: 4_000_000,
36+
})
4337
.then((tx: ContractTransaction) => {
4438
tx.wait()
4539
.then((receipt) => {

0 commit comments

Comments
 (0)