Replace giveth-bridge with @giveth/bridge package

related to #600
Giveth · Aug 26, 2021 · 1757035 · 1757035
1 parent 73bd7c6
commit 1757035
Show file tree

Hide file tree

Showing 13 changed files with 2,816 additions and 2,560 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,6 +56,8 @@
     "@feathersjs/express": "^4.5.11",
     "@feathersjs/feathers": "^4.5.11",
     "@feathersjs/socketio": "^4.5.11",
+    "@giveth/bridge": "^1.0.6",
+    "@giveth/bridge-contract": "^1.0.6",
     "@giveth/liquidpledging-contract": "^1.0.2",
     "@giveth/lpp-campaign": "^2.0.0-beta.1",
     "@giveth/lpp-capped-milestone": "^1.1.2",
@@ -82,8 +84,6 @@
     "feathers-swagger": "^1.2.1",
     "form-data": "^3.0.0",
     "fs-blob-store": "^5.2.1",
-    "giveth-bridge": "^1.0.5",
-    "giveth-liquidpledging": "^1.0.1",
     "graphql": "^15.5.1",
     "graphql-request": "^3.5.0",
     "helmet": "^3.8.1",

diff --git a/scripts/deploy.js b/scripts/deploy.js
@@ -1,10 +1,17 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const Web3 = require('web3');
-const { Kernel, ACL, LPVault, LiquidPledging, LPFactory, test } = require('giveth-liquidpledging');
-const { LPPCampaign, LPPCampaignFactory } = require('lpp-campaign');
-const { BridgedMilestone, LPMilestone, MilestoneFactory } = require('lpp-milestones');
+const {
+  Kernel,
+  ACL,
+  LPVault,
+  LiquidPledging,
+  LPFactory,
+  test,
+} = require('@giveth/liquidpledging-contract');
+const { LPPCampaign, LPPCampaignFactory } = require('@giveth/lpp-campaign');
+const { BridgedMilestone, LPMilestone, MilestoneFactory } = require('@giveth/lpp-milestones');
 const { MiniMeTokenFactory, MiniMeToken, MiniMeTokenState } = require('minimetoken');
-const { GivethBridge, ForeignGivethBridge } = require('giveth-bridge');
+const { GivethBridge, ForeignGivethBridge } = require('@giveth/bridge');
 const startNetworks = require('./startNetworks');
 
 const { RecoveryVault } = test;

diff --git a/scripts/deployBridge.js b/scripts/deployBridge.js
@@ -1,11 +1,17 @@
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
 const Web3 = require('web3');
-const { LiquidPledging, LPVault, LPFactory, Kernel, ACL } = require('giveth-liquidpledging');
+const {
+  LiquidPledging,
+  LPVault,
+  LPFactory,
+  Kernel,
+  ACL,
+} = require('@giveth/liquidpledging-contract');
 const { MiniMeTokenFactory } = require('minimetoken');
-const { GivethBridge, ForeignGivethBridge } = require('giveth-bridge');
-const { LPPCampaignFactory, LPPCampaign } = require('lpp-campaign');
-const { LPPCappedMilestoneFactory, LPPCappedMilestone } = require('lpp-capped-milestone');
+const { GivethBridge, ForeignGivethBridge } = require('@giveth/bridge');
+const { LPPCampaignFactory, LPPCampaign } = require('@giveth/lpp-campaign');
+const { LPPCappedMilestoneFactory, LPPCappedMilestone } = require('@giveth/lpp-capped-milestone');
 
 const keys = require('./keys.js');
 

diff --git a/scripts/deployBridgeProduction.js b/scripts/deployBridgeProduction.js
@@ -1,10 +1,10 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const Web3 = require('web3');
-const { LiquidPledging, LPVault, LPFactory, Kernel, ACL } = require('giveth-liquidpledging');
+const { LiquidPledging, LPVault, LPFactory, Kernel, ACL } = require('@giveth/liquidpledging-contract');
 const { MiniMeTokenFactory } = require('minimetoken');
-const { GivethBridge, ForeignGivethBridge } = require('giveth-bridge');
-const { LPPCampaignFactory, LPPCampaign } = require('lpp-campaign');
-const { LPPCappedMilestoneFactory, LPPCappedMilestone } = require('lpp-capped-milestone');
+const { GivethBridge, ForeignGivethBridge } = require('@giveth/bridge');
+const { LPPCampaignFactory, LPPCampaign } = require('@giveth/lpp-campaign');
+const { LPPCappedMilestoneFactory, LPPCappedMilestone } = require('@giveth/lpp-capped-milestone');
 
 const keys = require('./keys.js');
 

diff --git a/scripts/deployNative.js b/scripts/deployNative.js
@@ -1,8 +1,15 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const Web3 = require('web3');
-const { Kernel, ACL, LPVault, LiquidPledging, LPFactory, test } = require('giveth-liquidpledging');
-const { LPPCampaign, LPPCampaignFactory } = require('lpp-campaign');
-const { LPPCappedMilestone, LPPCappedMilestoneFactory } = require('lpp-capped-milestone');
+const {
+  Kernel,
+  ACL,
+  LPVault,
+  LiquidPledging,
+  LPFactory,
+  test,
+} = require('@giveth/liquidpledging-contract');
+const { LPPCampaign, LPPCampaignFactory } = require('@giveth/lpp-campaign');
+const { LPPCappedMilestone, LPPCappedMilestoneFactory } = require('@giveth/lpp-capped-milestone');
 const { MiniMeTokenFactory, MiniMeToken, MiniMeTokenState } = require('minimetoken');
 const startNetworks = require('./startNetworks');
 

diff --git a/scripts/deployNewMilestones.js b/scripts/deployNewMilestones.js
@@ -1,8 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
 const Web3 = require('web3');
-const { LiquidPledging, Kernel, ACL } = require('giveth-liquidpledging');
-const { BridgedMilestone, LPMilestone, MilestoneFactory } = require('lpp-milestones');
+const { LiquidPledging, Kernel, ACL } = require('@giveth/liquidpledging-contract');
+const { BridgedMilestone, LPMilestone, MilestoneFactory } = require('@giveth/lpp-milestones');
 
 const keys = require('./keys.js');
 

diff --git a/scripts/startBridge.js b/scripts/startBridge.js
@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies, prefer-destructuring */
-const bridge = require('giveth-bridge/bridge');
+const bridge = require('@giveth/bridge/bridge');
 const startNetworks = require('./startNetworks');
 const logger = require('winston');
 

diff --git a/scripts/upgradeForeignBridge.js b/scripts/upgradeForeignBridge.js
@@ -2,7 +2,7 @@
 const Web3 = require('web3');
 const { LiquidPledging, Kernel } = require('giveth-liquidpledging');
 const { MiniMeToken, MiniMeTokenFactory } = require('minimetoken');
-const { ForeignGivethBridge } = require('giveth-bridge');
+const { ForeignGivethBridge } = require('@giveth/bridge');
 const { LPPCappedMilestone } = require('lpp-capped-milestone');
 
 const keys = require('./keys.js');

diff --git a/scripts/upgradeHomeBridge.js b/scripts/upgradeHomeBridge.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const Web3 = require('web3');
-const { GivethBridge } = require('giveth-bridge');
+const { GivethBridge } = require('@giveth/bridge');
 
 const keys = require('./keys.js');
 

diff --git a/scripts/utils/getHomeTxHash.js b/scripts/utils/getHomeTxHash.js
@@ -1,5 +1,5 @@
 const Web3 = require('web3');
-const ForeignGivethBridgeArtifact = require('giveth-bridge/build/ForeignGivethBridge.json');
+const ForeignGivethBridgeArtifact = require('@giveth/bridge-contract/build/ForeignGivethBridge.json');
 const logger = require('winston');
 const topicsFromArtifacts = require('../../src/blockchain/lib/topicsFromArtifacts');
 const eventDecodersFromArtifact = require('../../src/blockchain/lib/eventDecodersFromArtifact');

diff --git a/src/blockchain/pledges.js b/src/blockchain/pledges.js
@@ -1,4 +1,4 @@
-const ForeignGivethBridgeArtifact = require('giveth-bridge/build/ForeignGivethBridge.json');
+const ForeignGivethBridgeArtifact = require('@giveth/bridge-contract/build/ForeignGivethBridge.json');
 const LiquidPledgingArtifact = require('@giveth/liquidpledging-contract/build/LiquidPledging.json');
 const logger = require('winston');
 const { toBN } = require('web3-utils');

diff --git a/src/blockchain/watcher.js b/src/blockchain/watcher.js
@@ -1,7 +1,7 @@
 const { LiquidPledging, LPVault, Kernel } = require('@giveth/liquidpledging-contract');
 const { LPPCappedMilestone } = require('@giveth/lpp-capped-milestone');
 const { BridgedMilestone, LPMilestone } = require('@giveth/lpp-milestones');
-const { GivethBridge } = require('giveth-bridge');
+const { GivethBridge } = require('@giveth/bridge');
 const semaphore = require('semaphore');
 const { keccak256, padLeft, toHex } = require('web3-utils');
 const logger = require('winston');