Skip to content
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.

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

Adding Near -> Eth connectors #99

Merged
merged 71 commits into from
Aug 10, 2022
Merged
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c81aea9
Init empty NEAR->ETH token locker/bridge
ilblackdragon Mar 27, 2022
ab2de0b
Adding implementation of NEP 141 token locker
ilblackdragon Mar 27, 2022
4be44df
Add metadata logging on NEAR side
ilblackdragon Mar 27, 2022
83fe884
implemented Ethereum ERC-20 connector
kirikov Mar 27, 2022
d4e7a8a
Merge branch 'near-eth-connectors' of https://github.com/ilblackdrago…
kirikov Mar 27, 2022
5bb3489
Fixing up refactor
ilblackdragon Mar 27, 2022
b028bf8
Remove erc20-bridge-token/build files
ilblackdragon Mar 27, 2022
048e715
Add gitignore for erc20-bridge-token
ilblackdragon Mar 27, 2022
829ed32
Update bridge-common/Cargo.toml
ilblackdragon Apr 1, 2022
0bd79c0
updated package.json
Shockedshodan Apr 19, 2022
428b70f
add proxy contract
Shockedshodan Apr 19, 2022
27732bb
fixed comments 1
Shockedshodan Apr 19, 2022
785daf8
updated lib dependencies, preping for hardhat
Shockedshodan Apr 20, 2022
a188c17
updated test according to new logic
Shockedshodan Apr 20, 2022
019d725
minor fixes based on comments
Shockedshodan Apr 20, 2022
6d7b392
upgradeable factory
Shockedshodan Apr 21, 2022
167f3ff
remove truffle assertion
Shockedshodan Apr 21, 2022
bced32c
fix my mess up
Shockedshodan Apr 21, 2022
5f94610
fix my mess up
Shockedshodan Apr 21, 2022
d172ba5
Updated locker
Shockedshodan Apr 21, 2022
986d5e7
initializable locker, delete erc20locker, upgradeable factory
Shockedshodan Apr 22, 2022
cd857ae
safe upgradeability, provermock
Shockedshodan Apr 22, 2022
61921c1
fixed proxy
Shockedshodan Apr 22, 2022
4c53635
rewriting tests
Shockedshodan Apr 22, 2022
a5592c9
updated git ignore
Shockedshodan Apr 22, 2022
a6bdeea
add coverage plugin
Shockedshodan Apr 22, 2022
d4f87f7
naming
Shockedshodan Apr 22, 2022
e246523
reverted Locker.sol to 9533fc7 commit state
Shockedshodan May 10, 2022
1f37b47
rust toolchain version updated
Shockedshodan May 10, 2022
2fbdde6
updaged wasm file-name
Shockedshodan May 10, 2022
ed18219
add required libs,proof template
Shockedshodan May 18, 2022
3922b76
add eslint.rc
Shockedshodan May 18, 2022
bd8390d
add waffle
Shockedshodan May 18, 2022
9218f44
add test
Shockedshodan May 18, 2022
dc65452
add waffle, lint fix
Shockedshodan May 18, 2022
62c080e
fixed name
Shockedshodan May 18, 2022
ed9ecc9
eslint ignore coverage
Shockedshodan May 19, 2022
f80cc68
add dotenv, deploy upgrade scripts
Shockedshodan May 19, 2022
1971593
updated test
Shockedshodan May 19, 2022
fb7e1e2
.env example
Shockedshodan May 19, 2022
2a9b5ce
bridge token upgrade tests
Shockedshodan May 20, 2022
6954569
add sizer
Shockedshodan May 20, 2022
b17a62d
add sizer
Shockedshodan May 20, 2022
d2e433c
rename locker
Shockedshodan May 20, 2022
95e3a42
name of builded token-locker
Shockedshodan May 27, 2022
863b58c
ignore coverage
Shockedshodan May 27, 2022
5ba398b
removed unused ganache in testrpc
Shockedshodan May 27, 2022
badc826
fix message in ProofConsumer
Shockedshodan May 27, 2022
f2ff8be
delete ganache test script
Shockedshodan May 27, 2022
ac62652
token upgrade script
Shockedshodan May 27, 2022
bca251a
add error catch to deploy scripts
Shockedshodan May 27, 2022
c4433f1
removed old coverage, fixed test and coverage commands
Shockedshodan May 31, 2022
67121c3
typo, small optimisation
Shockedshodan May 31, 2022
201e6d4
only adming can call setMetadata now, small optimisation
Shockedshodan May 31, 2022
5a77538
Cut some errors for optimisation purposes
Shockedshodan May 31, 2022
630174f
Update bridge-common/Cargo.toml
Shockedshodan Jun 3, 2022
2ca68bd
Update bridge-common/Cargo.toml
Shockedshodan Jun 3, 2022
aca89f0
Revert "Cut some errors for optimisation purposes"
Shockedshodan Jun 3, 2022
2496b3f
Updated rainbow-bridge-lib in package.json
Shockedshodan Jun 3, 2022
70548ad
Updated rainbow-bridge-lib path in token test
Shockedshodan Jun 3, 2022
d22f7d7
split ProofConsumer and Factory, fixed cut error message
Shockedshodan Jun 6, 2022
0326f9e
updated tests
Shockedshodan Jun 6, 2022
7177afa
typo in token-locker
Shockedshodan Jun 6, 2022
2fc2366
removed unused variable
Shockedshodan Jun 6, 2022
c8c3da4
move consts into prover module according to comments
Shockedshodan Jun 13, 2022
9cd323f
update dependencies for token-locker
Shockedshodan Jun 13, 2022
40a5dec
payable finish_withdraw, remove unnecessary arg in finish_log_meatadata
Shockedshodan Jun 13, 2022
e02458e
Migration near-sdk-rs from 3.1.0 to 4.0.0
Shockedshodan Jun 15, 2022
318a714
remove unused commented code
Shockedshodan Jun 15, 2022
c1d7502
add results decoder library
Shockedshodan Jul 13, 2022
fd83d33
fixed test token after refactor
Shockedshodan Jul 13, 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
updated test according to new logic
  • Loading branch information
Shockedshodan committed Apr 20, 2022

Verified

This commit was signed with the committer’s verified signature.
ilblackdragon Illia Polosukhin
commit a188c1738090847dbdf9a652914936471dfb7fcd
4 changes: 2 additions & 2 deletions erc20-bridge-token/test/BridgeToken.js
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ contract('BridgeToken', function ([_, addr1]) {
});

it('can update metadata', async function() {
const token = await BridgeToken.new("", "", 0);
const token = await BridgeToken.new();
let block = await web3.eth.getBlock("latest");
await token.initialize("", "", 0)
await token.set_metadata("NEAR ERC20", "NEAR", "18", String(block.number));

expect(await token.name()).to.equal("NEAR ERC20");
expect(await token.symbol()).to.equal("NEAR");
expect((await token.decimals()).toString()).to.equal("18");