Skip to content

State persist for handling pending transactions #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sumitsnk wants to merge 21 commits into
base: main
Choose a base branch
from
Open

State persist for handling pending transactions #76

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a8c5e60
State persist for handling pending transactions
sumitsnk Feb 4, 2022
d24d290
fixed merge conflict
sumitsnk Feb 15, 2022
7c71547
resolved empty state issue in page refresh
sumitsnk Feb 15, 2022
86737e1
Fixed redux-persist circular JSON error
sumitsnk Feb 15, 2022
6f9013c
updating UI for interacting snowbridge main
sumitsnk Feb 16, 2022
aee464c
polkadot callback and events handling
sumitsnk Feb 17, 2022
b7be3f0
refactor code
sumitsnk Feb 17, 2022
ce7a449
fixed nonce issue in lost subscription for polkadot
sumitsnk Feb 18, 2022
89baebe
Merge branch 'UI-fixes-snowbridge-main' of https://github.com/Snowfor…
sumitsnk Feb 18, 2022
fa0bf1b
Removed Ethereum getPastEvents api
sumitsnk Feb 21, 2022
8ada440
Added comments for functions
sumitsnk Feb 22, 2022
7f8b6f4
fixed merge conflicts
sumitsnk Feb 23, 2022
0c9209a
fixed contract address import issue
sumitsnk Feb 23, 2022
d3d5d24
fixed config
sumitsnk Feb 23, 2022
8bcfa91
Fixed UI build issue
sumitsnk Feb 24, 2022
920fceb
Fixed tx-status not updating in failed polkadot tx callback
sumitsnk Mar 1, 2022
935efb2
Added check for sufficient snowDOT and paraETH Fee during transfer
sumitsnk Mar 2, 2022
3b12ddb
Updating token Balance on tx confirmation
sumitsnk Mar 4, 2022
9429055
Fixed In-sufficient Fee issue
sumitsnk Mar 4, 2022
43c60c4
Fixed tx confirmation notify
sumitsnk Mar 8, 2022
7ec0844
warning fix's with suggestions
sumitsnk Mar 9, 2022
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
Prev Previous commit
Next Next commit
fixed merge conflicts
  • Loading branch information
@sumitsnk
sumitsnk committed Feb 23, 2022
commit 7f8b6f491c3430caa59b2491e4be7d4780ced990
19 changes: 9 additions & 10 deletions src/config-local.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default {
SNOWBRIDGE_EXPLORER_URL: 'https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A11144#/explorer',

PERMITTED_ETH_NETWORK: 'private',
PERMITTED_ETH_NETWORK_ID: '0x???',
PERMITTED_ETH_NETWORK_ID: '0xf',

BASIC_CHANNEL_ID: 0,
INCENTIVIZED_CHANNEL_ID: 1,
Expand All @@ -53,13 +53,12 @@ export default {
//Key required for connection with walletconnect
INFURA_KEY: process.env.REACT_APP_INFURA_KEY,
PARACHAIN_LIST : [
{ "parachainName":'Snowbridge', "parachainId": 0, 'isDisabled':false },
{ "parachainName":'Snowbridge-test', "parachainId": 1001,'isDisabled':false },
{ "parachainName":'Acala (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Moonbeam (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Bifrost (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Kusama (coming soon...)', "parachainId": 0, 'isDisabled':true },
{ "parachainName":'Snowbridge (coming soon...)', "parachainId": 0,'isDisabled':true }
],
TRANSACTION_FEES:'0'
{ "parachainName":'Snowbridge', "parachainId": 0, 'isDisabled':false, 'transactionFee': 0 },
{ "parachainName":'Snowbridge-test', "parachainId": 1001,'isDisabled':false, 'transactionFee': 4000000 },
{ "parachainName":'Acala (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Moonbeam (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Bifrost (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Kusama (coming soon...)', "parachainId": 0, 'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Snowbridge (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 }
]
};
17 changes: 8 additions & 9 deletions src/config-staging.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ export default {
//Key required for connection with walletconnect
INFURA_KEY: process.env.REACT_APP_INFURA_KEY,
PARACHAIN_LIST : [
{ "parachainName":'Snowbridge', "parachainId": 0, 'isDisabled':false },
{ "parachainName":'Snowbridge-test', "parachainId": 1001,'isDisabled':false },
{ "parachainName":'Acala (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Moonbeam (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Bifrost (coming soon...)', "parachainId": 0,'isDisabled':true },
{ "parachainName":'Kusama (coming soon...)', "parachainId": 0, 'isDisabled':true },
{ "parachainName":'Snowbridge (coming soon...)', "parachainId": 0,'isDisabled':true }
],
TRANSACTION_FEES:'0'
{ "parachainName":'Snowbridge', "parachainId": 0, 'isDisabled':false, 'transactionFee': 0 },
{ "parachainName":'Snowbridge-test', "parachainId": 1001,'isDisabled':false, 'transactionFee': 4000000 },
{ "parachainName":'Acala (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Moonbeam (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Bifrost (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Kusama (coming soon...)', "parachainId": 0, 'isDisabled':true, 'transactionFee': 0 },
{ "parachainName":'Snowbridge (coming soon...)', "parachainId": 0,'isDisabled':true, 'transactionFee': 0 }
]
};
9 changes: 4 additions & 5 deletions src/net/eth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ import Onboard from 'bnc-onboard'
// Import Contracts
import {
PERMITTED_ETH_NETWORK_ID,
INFURA_KEY,
INCENTIVIZED_OUTBOUND_CHANNEL_CONTRACT_ADDRESS,
TRANSACTION_FEES
INFURA_KEY,
CONTRACT_ADDRESS
} from '../config';

/* tslint:disable */
Expand Down Expand Up @@ -322,7 +321,7 @@ export default class Eth extends Api {
// call ether contract for ether
if (isEther(asset)) {
return ethContract.methods
.lock(polkadotRecipientBytes, channelId, parachainId,TRANSACTION_FEES)
.lock(polkadotRecipientBytes, channelId, parachainId,transactionFee)
.send({
from: sender,
gas: 500000,
Expand All @@ -338,7 +337,7 @@ export default class Eth extends Api {
amount,
channelId,
parachainId,
TRANSACTION_FEES
transactionFee
)
.send({
from: sender,
Expand Down
16 changes: 5 additions & 11 deletions src/redux/actions/transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ import { ThunkAction, ThunkDispatch } from 'redux-thunk';
import { Contract } from 'web3-eth-contract';
import { PromiEvent } from 'web3-core';
import Web3 from 'web3';
import {
REQUIRED_ETH_CONFIRMATIONS,
BASIC_OUTBOUND_CHANNEL_CONTRACT_ADDRESS,
INCENTIVIZED_OUTBOUND_CHANNEL_CONTRACT_ADDRESS,
BASIC_INBOUND_CHANNEL_CONTRACT_ADDRESS,
INCENTIVIZED_INBOUND_CHANNEL_CONTRACT_ADDRESS
} from '../../config';
import { REQUIRED_ETH_CONFIRMATIONS, CONTRACT_ADDRESS } from '../../config';
import {
Asset,
decimals,
Expand Down Expand Up @@ -395,15 +389,15 @@ export function handleEthTxRecipt(receipt: any, dispatch: Dispatch<any>,
(receipt.logs).forEach((log: any) => {
const event = log;

if (event.address === BASIC_OUTBOUND_CHANNEL_CONTRACT_ADDRESS) {
if (event.address === CONTRACT_ADDRESS.BasicOutboundChannel) {
const decodedEvent = web3.eth.abi.decodeLog(
basicOutChannelLogFields,
event.data,
event.topics,
);
nonce = decodedEvent.nonce;
}
if (event.address === INCENTIVIZED_OUTBOUND_CHANNEL_CONTRACT_ADDRESS) {
if (event.address === CONTRACT_ADDRESS.IncentivizedOutboundChannel) {
const decodedEvent = web3.eth.abi.decodeLog(
incentivizedOutChannelLogFields,
event.data,
Expand Down Expand Up @@ -519,12 +513,12 @@ export const handleEthereumMissedEvents = (

const incentivizeInboundContract = new web3.eth.Contract(
IncentivizedInboundChannel.abi as any,
INCENTIVIZED_INBOUND_CHANNEL_CONTRACT_ADDRESS,
CONTRACT_ADDRESS.IncentivizedInboundChannel,
);

const basicInboundContract = new web3.eth.Contract(
BasicInboundChannel.abi as any,
BASIC_INBOUND_CHANNEL_CONTRACT_ADDRESS,
CONTRACT_ADDRESS.BasicInboundChannel,
);

const incentivizeInboundLatestNonce = Number(await incentivizeInboundContract.methods.nonce().call());
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.