Skip to content

Implementing Multisig into Bridge contract #11

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
softwareultron wants to merge 147 commits into
base: master
Choose a base branch
from
Open

Implementing Multisig into Bridge contract #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
64e24a3
update(Sergey): added multisig contract: voter functions
softwareultron Apr 7, 2022
d035507
update(Sergey): finished multisig contract
softwareultron Apr 8, 2022
e8a6a55
fix(Sergey): naming errors
softwareultron Apr 8, 2022
d8126ed
update(Sergej): added DAO smart-contract, multisig refactor
softwareultron Apr 11, 2022
67d0904
update(Sergej): DAO smart contract refactor
softwareultron Apr 11, 2022
8208c07
update(Sergej): added Transfer request functions in DAO smart contract
softwareultron Apr 11, 2022
4430d15
update(Sergej): added hardhat
softwareultron Apr 11, 2022
bdb4593
update: .gitignore
softwareultron Apr 15, 2022
9944e44
update(Sergej): packages
softwareultron Apr 15, 2022
be4f1ba
update(Sergej): DAO contract, bridge contract
softwareultron Apr 15, 2022
be84fb2
fix: packages
softwareultron Apr 18, 2022
2f4eb40
update(Sergej): refactor
softwareultron Apr 19, 2022
239fa55
update(Sergej): unit tests for multisig
softwareultron Apr 19, 2022
26343f1
update(Sergej): refactor multisigrequest method, tests
softwareultron Apr 20, 2022
de24609
update(Sergej): replace voter added
softwareultron Apr 20, 2022
a34d63a
update(Sergej): replace voter removed
softwareultron Apr 20, 2022
50395ca
update(Sergej): refactor multisig, tests
softwareultron Apr 20, 2022
81de7c7
update(Sergej): refactor IDAO, DAO
softwareultron Apr 20, 2022
c6f53df
update(Sergej): connected Bridge and DAO contracts
softwareultron Apr 20, 2022
6d9e723
update(Sergej): refactor multisig tests
softwareultron Apr 22, 2022
ed8087a
fix(Sergej): DAO methods implementations
softwareultron Apr 22, 2022
fb5b0b9
update(Sergej): DAO tests, test helper for TS
softwareultron Apr 22, 2022
d8ab177
update(Sergej): DAO, Multisig NatSpec(documentation)
softwareultron Apr 23, 2022
73be267
fix(Sergej): gasPrice hardhatm helpers methods, DAO test
softwareultron Apr 23, 2022
cb5d9d4
update(Sergej): bridge smart contract, added bridge tests
softwareultron Apr 23, 2022
b2bdabb
fix(Sergej): bridge tests on truffle, including DAO
softwareultron Apr 23, 2022
36da38a
update(Sergej): gitignore changed; added dot-env-example
softwareultron Apr 23, 2022
3403c19
update(Sergej): dotenv packages
softwareultron Apr 25, 2022
9547591
update(Sergej): refactor initialvoter to constructor
softwareultron Apr 25, 2022
23f32d1
update(Sergej): added deploy scripts for DAO, Bridge
softwareultron Apr 25, 2022
845b0fa
update(Sergej): packages
softwareultron May 23, 2022
6ee2b7f
update(Sergej): bridge, DAO, ercHandlers smart contracts
softwareultron May 23, 2022
427d888
update(Sergej): edit hardhat tests
softwareultron May 23, 2022
71b43bc
update(Sergej): admin.js tests refactor
softwareultron May 23, 2022
95a6c51
fix(Sergej): params overflow checkup
softwareultron May 23, 2022
e63b0b7
update(Sergej): tests for truffle(not all passed - error on exec. Prop)
softwareultron May 23, 2022
b600b05
fix(Sergej): chainId type; test
softwareultron May 23, 2022
17258bb
fix(Sergej): sameChain test value
softwareultron May 23, 2022
a866a46
update(Sergej): truffle tests; evalFee func in ERC20handler
softwareultron May 24, 2022
f8f2a64
update(Sergej): finished truffle tests
softwareultron May 24, 2022
09ce073
fix(Sergej): truffle test exec Proposal
softwareultron May 24, 2022
28a4a7b
update(Sergej): depositERC20 fee event
softwareultron May 24, 2022
538a2a8
Merge pull request #23 from UltronFoundationDev/22-changing-fee
softwareultron May 24, 2022
28e3841
update(Sergej): execProposal fee on ERC20Handler
softwareultron May 24, 2022
17b8842
update(Sergej): natspec
softwareultron May 24, 2022
63ef9a9
update(Sergej): refactor truffle tests for execProposal on ERC20Handler
softwareultron May 24, 2022
dc0494b
update(Sergej): GenericHandler deprce parameter
softwareultron May 24, 2022
ac0181e
Merge pull request #25 from UltronFoundationDev/22-changing-fee
softwareultron May 24, 2022
287eb19
update(Sergej): countGet DAO methods; ts helper
softwareultron May 25, 2022
67ec8ba
fix(Sergej): Generic Handler deposit error
softwareultron May 25, 2022
2f7d269
update(Sergej): added treasuryAddress, genericHandler error
softwareultron May 25, 2022
3f2832d
update(Sergej): hardhat tests
softwareultron May 25, 2022
fcde4a6
update(Sergej): truffle tests
softwareultron May 25, 2022
0e4dd03
fix(Sergej): truffle, HH tests
softwareultron May 25, 2022
dc9b848
fix(Sergej): truffle tests
softwareultron May 25, 2022
fab3e2e
Merge pull request #28 from UltronFoundationDev/27-transfer-to-treasury
softwareultron May 25, 2022
86c7d26
Merge branch 'dev' into 24-refactor-DAO
softwareultron May 25, 2022
5e4be76
update(Sergej): imlemented DAO new features
softwareultron May 25, 2022
3299ba4
update(Sergej): removed unused library
softwareultron May 25, 2022
275e6b0
update(Sergej): deploy scripts
softwareultron May 26, 2022
40c7168
fix(Sergej): hh cfg file
softwareultron May 26, 2022
f8b1c00
fix(Sergej): ultron url
softwareultron May 26, 2022
7a46829
update(Sergej): initialRelayer in script
softwareultron May 26, 2022
dd9a223
update(Sergej): Hardhat cfg,deploy script
softwareultron May 26, 2022
9c505bf
update(Sergej): refactor DAO, Multisig smart-contracts
softwareultron May 31, 2022
dce8a7d
update(Sergej): refactor hardhat tests
softwareultron May 31, 2022
9c41676
update(Sergej): refactor truffle tests
softwareultron May 31, 2022
d58dfcb
update(Sergej): refactor deploy scripts
softwareultron May 31, 2022
67c4908
Merge branch 'dev' into 24-refactor-DAO
softwareultron May 31, 2022
306dd25
fix(Sergej): truffle tests
softwareultron May 31, 2022
9a65157
update(Sergej): deploy scripts
softwareultron May 31, 2022
186af5e
Merge pull request #29 from UltronFoundationDev/24-refactor-DAO
softwareultron May 31, 2022
9a5338e
fix deploy with fee (Bogdan)
backendultron May 31, 2022
04501ea
fix(Sergej): .deps folder
softwareultron May 31, 2022
ad29272
fix(Sergej): deleted useless comment
softwareultron May 31, 2022
7134eff
update(Sergej): DAO setTreasury, erc20Handler SetDAOInitial
softwareultron Jun 4, 2022
25959e8
update(Sergej): hardhat tests
softwareultron Jun 4, 2022
6eb303a
update(Sergej): truffle tests
softwareultron Jun 4, 2022
7a2e853
update(Sergej): deploy scripts
softwareultron Jun 4, 2022
c6029f5
fix(Sergej): truffle tests
softwareultron Jun 4, 2022
8942bf3
Merge pull request #31 from UltronFoundationDev/treasury-setter
softwareultron Jun 4, 2022
0ddbf1f
update(Sergej): hardhat cfg file
softwareultron Jun 4, 2022
78c81d8
fix(Sergej): .env require
softwareultron Jun 4, 2022
f8227de
update(Sergej): hardhat version
softwareultron Jun 4, 2022
a83cdcf
update(Sergej): refactor deploy script
softwareultron Jun 5, 2022
231505d
fix(Sergej): deploy script
softwareultron Jun 6, 2022
adf929b
update(Sergej): contracts for deploying tokens
softwareultron Jun 7, 2022
1ef7245
fix(Sergej): hardhat cfg
softwareultron Jun 7, 2022
29d3184
update(Sergej): deploy script(not finished fee)
softwareultron Jun 7, 2022
3e55be8
update(sergej): deploy scripts
softwareultron Jun 7, 2022
d8165df
update(Sergej): cfg
softwareultron Jun 7, 2022
f30f976
update(Sergej): gas price
softwareultron Jun 7, 2022
bedf06e
update(Sergej): Set-resourceIds tasks
softwareultron Jun 8, 2022
7d4c5ac
update(Sergej): changeFee tasks
softwareultron Jun 8, 2022
5d81fdd
update(Sergej): changed relayers threshold request
softwareultron Jun 8, 2022
a5dcf36
update(Segej): eth dao address
softwareultron Jun 8, 2022
a86fdb1
update(Sergej): deploy contracts script
softwareultron Jun 8, 2022
5fd6d43
update(Sergej): setResources
softwareultron Jun 8, 2022
464f1c4
upsate(Sergej): fee script
softwareultron Jun 8, 2022
b47ab0b
update(Sergej): fee script
softwareultron Jun 8, 2022
b98df0f
fix(Sergej): avax USDT.e deploy address; bsc chain fee
softwareultron Jun 9, 2022
1b20399
fix(Sergej): bsc fee on USDC/USDT
softwareultron Jun 9, 2022
810e9ad
update(Sergej): changed deploy scripts
softwareultron Jun 9, 2022
989494d
update(Sergej):eth deploy script
softwareultron Jun 10, 2022
bc29d89
update(Sergej): hardhat tasks checking set bridge settings
softwareultron Jun 11, 2022
d460ffd
update(Sergej): receive function + test
softwareultron Jun 12, 2022
6f4b27b
update(Sergej): sends native tokens for gas to recepient
softwareultron Jun 13, 2022
0866387
Merge pull request #34 from UltronFoundationDev/33-transfer-native-to…
softwareultron Jun 13, 2022
8c61443
update(Sergej): scripts for new addresses
softwareultron Jun 13, 2022
1bf8508
fix(Sergej): fee on USDC
softwareultron Jun 14, 2022
ec11f63
fix(Sergej): fee script
softwareultron Jun 14, 2022
a4efe68
update(Sergej): withdraw script
softwareultron Jun 14, 2022
6a505bb
fix(Sergej): btc fee
softwareultron Jun 15, 2022
c0c89da
fix(Sergej): wBTC fee (8 decimals) on POLYGON, FTM, ETH, AVAX
softwareultron Jun 15, 2022
145a780
update(Sergej): wMatic
softwareultron Jun 15, 2022
3590c9b
fix(Sergej): truffle tests
softwareultron Jun 15, 2022
2111d70
fix(Sergej): truffle tests
softwareultron Jun 15, 2022
bd67f14
update(Sergej): deleted require on Handler
softwareultron Jun 16, 2022
6a84231
update(sergej): logging minter
softwareultron Jun 16, 2022
822601f
update(Sergej): nonce script
softwareultron Jun 16, 2022
2a82d32
update(Sergej): added changeTreasury, multisig tasks
softwareultron Jun 16, 2022
9c29b67
update(Sergej): multisig, treasury scripts
softwareultron Jun 17, 2022
cb67ba2
update(Sergej): packages
softwareultron Jul 25, 2022
295fea0
update(Sergej): getData from storage
softwareultron Jul 25, 2022
bb93c4d
update(Sergej): changed recepient address in withdraw
softwareultron Jul 25, 2022
5bcb140
fix(Sergej): dao withdraw cancel
softwareultron Jul 25, 2022
7d62c6f
update(Sergej): fees; deploy script for token
softwareultron Jul 30, 2022
c5b0fe7
fix(sergej): testnet uri; deploy tokens task
softwareultron Aug 1, 2022
65c14a3
update(Sergej): get from nested mapping
softwareultron Aug 22, 2022
df275af
fix(Sergej): naming error
softwareultron Aug 22, 2022
171be6f
update(Sergej): getData from nested mapping
softwareultron Aug 22, 2022
66d2d5d
update(Sergej): getting withdraw struct
softwareultron Aug 23, 2022
65687d4
update(Sergej): parsed all of the structs
softwareultron Aug 23, 2022
3eee789
update(Sergej): fees, resourceIds
softwareultron Aug 29, 2022
4f24827
feat(Sergej): deleted useless methods
softwareultron Sep 30, 2022
5440d66
feat(Sergej): sub-tokens update
softwareultron Jan 12, 2023
3cd9581
fix(Sergej): flux
softwareultron Jan 13, 2023
809859d
feat(Sergej): token deployments
softwareultron May 18, 2023
4c69cff
feat(Sergej): pepe set up
softwareultron May 29, 2023
d40114f
Revert "Merge pull request #34 from UltronFoundationDev/33-transfer-n…
softwareultron Nov 4, 2024
2ee581c
feat(tokens): permit
softwareultron Nov 4, 2024
385bde6
feat(deploy): base network
softwareultron Nov 4, 2024
b0c300d
fix(token): ak1111
softwareultron Nov 5, 2024
9ca7264
feat(cfg): usdc, treasury
softwareultron Nov 14, 2024
82d70c6
feat(token): moodeng
softwareultron Nov 27, 2024
833fb42
fix(tasks): fee
softwareultron Dec 5, 2024
359d9e0
feat: base cfg
softwareultron Jul 1, 2025
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
3 changes: 3 additions & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ETHERSCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1
API_URL=https://eth-mainnet.alchemyapi.io/v2/<your api key>
PRIVATE_KEY=0xabc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc1
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ coverage.json
src/ethers
src/web3
ganache-cli/
dist/
dist/
typechain/
typechain-types/
cache/
artifacts/
.env
.deps/
254 changes: 165 additions & 89 deletions contracts/Bridge.sol
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading