certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix truffle-config and 1conf patch

This commit is contained in:
Csongor Kiss 2022-06-22 17:12:13 +01:00 committed by Evan Gray
parent 3d373669e5
commit fe198be748
3 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clients/js/networks.ts
View File

@ -117,23 +117,23 @@ const TESTNET = {
},
ethereum: {
rpc: `https://goerli.infura.io/v3/${get_env_var("INFURA_KEY")}`,
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
bsc: {
rpc: "https://data-seed-prebsc-1-s1.binance.org:8545",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
polygon: {
rpc: `https://polygon-mumbai.infura.io/v3/${get_env_var("INFURA_KEY")}`,
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
avalanche: {
rpc: "https://api.avax-test.network/ext/bc/C/rpc",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
oasis: {
rpc: "https://testnet.emerald.oasis.dev",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
algorand: {
rpc: undefined,
@ -141,27 +141,27 @@ const TESTNET = {
},
fantom: {
rpc: "https://rpc.testnet.fantom.network",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
aurora: {
rpc: "https://testnet.aurora.dev",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
karura: {
rpc: "http://103.253.145.222:8545",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
acala: {
rpc: "http://157.245.252.103:8545",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
klaytn: {
rpc: "https://api.baobab.klaytn.net:8651",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
celo: {
rpc: "https://alfajores-forno.celo-testnet.org",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
near: {
rpc: undefined,
@ -169,11 +169,11 @@ const TESTNET = {
},
moonbeam: {
rpc: "https://rpc.api.moonbase.moonbeam.network",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
neon: {
rpc: "https://proxy.devnet.neonlabs.org/solana",
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
terra2: {
rpc: "https://pisco-lcd.terra.dev",
@ -182,7 +182,7 @@ const TESTNET = {
},
ropsten: {
rpc: `https://ropsten.infura.io/v3/${get_env_var("INFURA_KEY")}`,
key: get_env_var("ETH_KEY"),
key: get_env_var("ETH_KEY_TESTNET"),
},
};

31
ethereum/1conf.patch
View File

@ -1,8 +1,8 @@
diff --git a/ethereum/contracts/bridge/Bridge.sol b/ethereum/contracts/bridge/Bridge.sol
index 3f06757f..6c70e6fa 100644
index 56672cc1..7d287972 100644
--- a/ethereum/contracts/bridge/Bridge.sol
+++ b/ethereum/contracts/bridge/Bridge.sol
@@ -58,7 +58,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
@@ -55,7 +55,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
sequence = wormhole().publishMessage{
value : msg.value
@ -10,21 +10,30 @@ index 3f06757f..6c70e6fa 100644
+ }(nonce, encoded, 1);
}
function wrapAndTransferETH(uint16 recipientChain, bytes32 recipient, uint256 arbiterFee, uint32 nonce) public payable returns (uint64 sequence) {
@@ -173,7 +173,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
sequence = wormhole().publishMessage{
value : callValue
- }(nonce, encoded, 15);
+ }(nonce, encoded, 1);
/*
@@ -314,7 +314,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
sequence = wormhole().publishMessage{value: callValue}(
nonce,
encoded,
- 15
+ 1
);
}
@@ -351,7 +351,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
sequence = wormhole().publishMessage{value: callValue}(
nonce,
encoded,
- 15
+ 1
);
}
function updateWrapped(bytes memory encodedVm) external returns (address token) {
diff --git a/ethereum/contracts/nft/NFTBridge.sol b/ethereum/contracts/nft/NFTBridge.sol
index abf25a28..78f9a781 100644
index b2b9fb99..895c1921 100644
--- a/ethereum/contracts/nft/NFTBridge.sol
+++ b/ethereum/contracts/nft/NFTBridge.sol
@@ -95,7 +95,7 @@ contract NFTBridge is NFTBridgeGovernance {
@@ -94,7 +94,7 @@ contract NFTBridge is NFTBridgeGovernance {
sequence = wormhole().publishMessage{
value : callValue

33
ethereum/truffle-config.js
View File

@ -49,8 +49,6 @@ module.exports = {
);
},
network_id: "5",
gas: 4465030,
gasPrice: 10000000000,
},
binance: {
provider: () => {
@ -70,8 +68,6 @@ module.exports = {
"https://data-seed-prebsc-1-s1.binance.org:8545/"
),
network_id: "97",
gas: 70000000,
gasPrice: 8000000000,
},
polygon: {
provider: () => {
@ -123,6 +119,15 @@ module.exports = {
gas: 4465030,
gasPrice: 30000000000,
},
oasis_testnet: {
provider: () => {
return new HDWalletProvider(
process.env.MNEMONIC,
"https://testnet.emerald.oasis.dev"
);
},
network_id: 42261,
},
aurora: {
provider: () => {
return new HDWalletProvider(
@ -142,7 +147,7 @@ module.exports = {
},
network_id: 0x4e454153,
gas: 10000000,
from: "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0", // public key
from: "0x3bC7f2e458aC4E55F941C458cfD8c6851a591B4F", // public key
},
fantom: {
provider: () => {
@ -164,8 +169,6 @@ module.exports = {
);
},
network_id: 0xfa2,
gas: 4465030,
gasPrice: 300000000000,
},
karura: {
provider: () => {
@ -185,13 +188,13 @@ module.exports = {
provider: () => {
return new HDWalletProvider(
process.env.MNEMONIC,
"http://103.253.145.222:8545"
"https://karura-dev.aca-dev.network/eth/http"
);
},
network_id: 596,
gasPrice: 202184721385,
gasLimit: 117096000,
gas: 117096000,
gasPrice: "0x2f7e8805de",
gasLimit: "0x329b140",
gas: "0x329b0dc",
},
acala: {
provider: () => {
@ -210,13 +213,13 @@ module.exports = {
provider: () => {
return new HDWalletProvider(
process.env.MNEMONIC,
"http://157.245.252.103:8545"
"https://acala-dev.aca-dev.network/eth/http"
);
},
network_id: 597,
gasPrice: 202184721385,
gasLimit: 213192000,
gas: 213192000,
gasPrice: "0x2ed51903ea",
gasLimit: "0x6fc3540",
gas: "0x329b0dc",
},
klaytn: {
// Note that Klaytn works with version 5.3.14 of truffle, but not some of the newer versions.