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

fix: Use new version of the connector. #527

Merged
merged 12 commits into from
Mar 14, 2021
Merged

fix: Use new version of the connector. #527

merged 12 commits into from
Mar 14, 2021

Conversation

mfornet
Copy link
Contributor

@mfornet mfornet commented Mar 11, 2021

This PR was created to trigger CI (and integration tests) with the new version of the connector

TODO: Don't use current pinned commit from token-connector, instead wait until it is merged into master

Instead use env::predecessor_account_id. Using signer_account_id
has the same problems of using tx.origin in Ethereum. See link
below for more details:

ethereum/solidity#683
Need to use fixed near-sdk-version for compatibility
with rainbow-token-connector. This restriction will
be lifted once the special commit used by the connector
lands on near-sdk-rs.
TODO: Don't use current pinned commit from token-connector,
instead wait until it is merged into master
@mfornet mfornet changed the base branch from master to fixed-near-sdk March 11, 2021 21:58
@mfornet mfornet marked this pull request as ready for review March 12, 2021 22:32
@mfornet mfornet changed the base branch from fixed-near-sdk to master March 12, 2021 22:38
@alexauroradev
Copy link

Closes #519

Copy link

@alexauroradev alexauroradev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, please check the commits

cli/package.json Outdated
@@ -34,7 +34,7 @@
"rainbow-bridge-near2eth-block-relay": "1.0.0",
"rainbow-bridge-watchdog": "1.0.0",
"rainbow-bridge-testing": "1.0.0",
"rainbow-token-connector": "near/rainbow-token-connector#0646850267c42057e92f2d670eebe79c9c9211f9",
"rainbow-token-connector": "near/rainbow-token-connector#6855221404f81f987fcf1db9a860b2345149531a",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we not using d6022357e8e59ea790ff52af80df40f6036d1ec9 -- the merge of NEP-141 migration?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

atm of writing it, that PR haven't land, let's update.

@@ -8,4 +8,4 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]

[dependencies]
near-sdk = "0.11.0"
near-sdk = { git = "https://github.com/near/near-sdk-rs", rev = "613adcab6322e4f830efb4d5bde2a810ae642158" }

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check the commit please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is the right commit (the first in this PR: near/near-sdk-rs#325) It is already merged, after release we will be able to update.

cli/package.json Outdated Show resolved Hide resolved
@mfornet mfornet enabled auto-merge (squash) March 12, 2021 23:21
@mfornet
Copy link
Contributor Author

mfornet commented Mar 12, 2021

This PR already contains #525 and #524

Use commit on master.
@mfornet mfornet disabled auto-merge March 14, 2021 23:03
@mfornet mfornet merged commit 9ffb08e into master Mar 14, 2021
@mfornet mfornet deleted the update_connector branch April 7, 2021 12:45
karim-en pushed a commit that referenced this pull request Dec 20, 2021
* fix: Don't use env::signer_account_id

Instead use env::predecessor_account_id. Using signer_account_id
has the same problems of using tx.origin in Ethereum. See link
below for more details:

ethereum/solidity#683

* fix: Use fixed near-sdk-version

Need to use fixed near-sdk-version for compatibility
with rainbow-token-connector. This restriction will
be lifted once the special commit used by the connector
lands on near-sdk-rs.

* Add test to check near contracts are compiled correctly

* Fix pipeline.yml syntax

* Update near-sdk from eth-types

* Recompile contracts

* fix: Use new version of the connector.

TODO: Don't use current pinned commit from token-connector,
instead wait until it is merged into master

* Update arguments to deploy locker

using new interface

* Use fixed amount of gas

* Compile contracts

* Update tests

* Update cli/package.json

Use commit on master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants