From 6c1704bb0940f189821557fc0bf859b815c73660 Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:30:32 +0100 Subject: [PATCH 1/5] Increase gas price for scripts (#2237) From 00e12a662337425c63f0f398de85b5bd5faf4161 Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:32:03 +0100 Subject: [PATCH 2/5] increase gas price for scripts (#2238) --- package-lock.json | 4 ++-- package.json | 2 +- scripts/set-ask.js | 4 +++- scripts/set-operator-fee.js | 2 +- scripts/set-stake.js | 7 +++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9691dec934..9b284f6da5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index 87cf4e38e3..761ff6f3b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "description": "OTNode v6 Beta 2", "main": "index.js", "type": "module", diff --git a/scripts/set-ask.js b/scripts/set-ask.js index cf36230a25..cd122cf494 100644 --- a/scripts/set-ask.js +++ b/scripts/set-ask.js @@ -31,7 +31,9 @@ async function setAsk(rpcEndpoint, ask, walletPrivateKey, hubContractAddress) { const askWei = ethers.utils.parseEther(ask); const walletSigner = wallet.connect(provider); - await profile.connect(walletSigner).setAsk(identityId, askWei, { gasLimit: 1_000_000 }); + await profile + .connect(walletSigner) + .setAsk(identityId, askWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'ask', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-operator-fee.js b/scripts/set-operator-fee.js index 8695281717..b81d695b91 100644 --- a/scripts/set-operator-fee.js +++ b/scripts/set-operator-fee.js @@ -31,7 +31,7 @@ async function setOperatorFee(rpcEndpoint, operatorFee, walletPrivateKey, hubCon const walletSigner = wallet.connect(provider); stakingContract .connect(walletSigner) - .setOperatorFee(identityId, operatorFee, { gasLimit: 1_000_000 }); + .setOperatorFee(identityId, operatorFee, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'operatorFee', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-stake.js b/scripts/set-stake.js index ba9c1e9d95..549d71f89d 100644 --- a/scripts/set-stake.js +++ b/scripts/set-stake.js @@ -49,11 +49,14 @@ async function setStake( const managementWalletSigner = managementWallet.connect(provider); await tokenContract .connect(managementWalletSigner) - .increaseAllowance(stakingContractAddress, stakeWei, { gasLimit: 1_000_000 }); + .increaseAllowance(stakingContractAddress, stakeWei, { + gasPrice: 1_000, + gasLimit: 1_000_000, + }); // TODO: Add ABI instead of hard-coded function definition await stakingContract .connect(managementWalletSigner) - ['addStake(uint72,uint96)'](identityId, stakeWei, { gasLimit: 1_000_000 }); + ['addStake(uint72,uint96)'](identityId, stakeWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = [ From 5dc7bbabb20ce632f32a8ec91772a8dc836c72d8 Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:33:40 +0100 Subject: [PATCH 3/5] Revert "Increase gas price for scripts (#2237)" (#2239) This reverts commit 6c1704bb0940f189821557fc0bf859b815c73660. From d225065ef2193e53ce49e59f53c4761c4cbbf5cd Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:36:02 +0100 Subject: [PATCH 4/5] Revert "increase gas price for scripts (#2238)" (#2240) This reverts commit 00e12a662337425c63f0f398de85b5bd5faf4161. --- package-lock.json | 4 ++-- package.json | 2 +- scripts/set-ask.js | 4 +--- scripts/set-operator-fee.js | 2 +- scripts/set-stake.js | 7 ++----- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b284f6da5..9691dec934 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.2", + "version": "6.0.0-beta.3.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.2", + "version": "6.0.0-beta.3.1.1", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index 761ff6f3b6..87cf4e38e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.2", + "version": "6.0.0-beta.3.1.1", "description": "OTNode v6 Beta 2", "main": "index.js", "type": "module", diff --git a/scripts/set-ask.js b/scripts/set-ask.js index cd122cf494..cf36230a25 100644 --- a/scripts/set-ask.js +++ b/scripts/set-ask.js @@ -31,9 +31,7 @@ async function setAsk(rpcEndpoint, ask, walletPrivateKey, hubContractAddress) { const askWei = ethers.utils.parseEther(ask); const walletSigner = wallet.connect(provider); - await profile - .connect(walletSigner) - .setAsk(identityId, askWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); + await profile.connect(walletSigner).setAsk(identityId, askWei, { gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'ask', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-operator-fee.js b/scripts/set-operator-fee.js index b81d695b91..8695281717 100644 --- a/scripts/set-operator-fee.js +++ b/scripts/set-operator-fee.js @@ -31,7 +31,7 @@ async function setOperatorFee(rpcEndpoint, operatorFee, walletPrivateKey, hubCon const walletSigner = wallet.connect(provider); stakingContract .connect(walletSigner) - .setOperatorFee(identityId, operatorFee, { gasPrice: 1_000, gasLimit: 1_000_000 }); + .setOperatorFee(identityId, operatorFee, { gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'operatorFee', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-stake.js b/scripts/set-stake.js index 549d71f89d..ba9c1e9d95 100644 --- a/scripts/set-stake.js +++ b/scripts/set-stake.js @@ -49,14 +49,11 @@ async function setStake( const managementWalletSigner = managementWallet.connect(provider); await tokenContract .connect(managementWalletSigner) - .increaseAllowance(stakingContractAddress, stakeWei, { - gasPrice: 1_000, - gasLimit: 1_000_000, - }); + .increaseAllowance(stakingContractAddress, stakeWei, { gasLimit: 1_000_000 }); // TODO: Add ABI instead of hard-coded function definition await stakingContract .connect(managementWalletSigner) - ['addStake(uint72,uint96)'](identityId, stakeWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); + ['addStake(uint72,uint96)'](identityId, stakeWei, { gasLimit: 1_000_000 }); } const expectedArguments = [ From 699e3c035f66a035a397cb9ca5232324b1912b60 Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:39:35 +0100 Subject: [PATCH 5/5] increase gas price, bump version (#2241) --- package-lock.json | 4 ++-- package.json | 2 +- scripts/set-ask.js | 4 +++- scripts/set-operator-fee.js | 2 +- scripts/set-stake.js | 7 +++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9691dec934..9b284f6da5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index 87cf4e38e3..761ff6f3b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.0.0-beta.3.1.1", + "version": "6.0.0-beta.3.1.2", "description": "OTNode v6 Beta 2", "main": "index.js", "type": "module", diff --git a/scripts/set-ask.js b/scripts/set-ask.js index cf36230a25..cd122cf494 100644 --- a/scripts/set-ask.js +++ b/scripts/set-ask.js @@ -31,7 +31,9 @@ async function setAsk(rpcEndpoint, ask, walletPrivateKey, hubContractAddress) { const askWei = ethers.utils.parseEther(ask); const walletSigner = wallet.connect(provider); - await profile.connect(walletSigner).setAsk(identityId, askWei, { gasLimit: 1_000_000 }); + await profile + .connect(walletSigner) + .setAsk(identityId, askWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'ask', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-operator-fee.js b/scripts/set-operator-fee.js index 8695281717..b81d695b91 100644 --- a/scripts/set-operator-fee.js +++ b/scripts/set-operator-fee.js @@ -31,7 +31,7 @@ async function setOperatorFee(rpcEndpoint, operatorFee, walletPrivateKey, hubCon const walletSigner = wallet.connect(provider); stakingContract .connect(walletSigner) - .setOperatorFee(identityId, operatorFee, { gasLimit: 1_000_000 }); + .setOperatorFee(identityId, operatorFee, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = ['rpcEndpoint', 'operatorFee', 'privateKey', 'hubContractAddress']; diff --git a/scripts/set-stake.js b/scripts/set-stake.js index ba9c1e9d95..549d71f89d 100644 --- a/scripts/set-stake.js +++ b/scripts/set-stake.js @@ -49,11 +49,14 @@ async function setStake( const managementWalletSigner = managementWallet.connect(provider); await tokenContract .connect(managementWalletSigner) - .increaseAllowance(stakingContractAddress, stakeWei, { gasLimit: 1_000_000 }); + .increaseAllowance(stakingContractAddress, stakeWei, { + gasPrice: 1_000, + gasLimit: 1_000_000, + }); // TODO: Add ABI instead of hard-coded function definition await stakingContract .connect(managementWalletSigner) - ['addStake(uint72,uint96)'](identityId, stakeWei, { gasLimit: 1_000_000 }); + ['addStake(uint72,uint96)'](identityId, stakeWei, { gasPrice: 1_000, gasLimit: 1_000_000 }); } const expectedArguments = [