feat: Pvt testnet config added (#204)

ethersphere · Oct 5, 2023 · c8148f5 · c8148f5
1 parent 15f09c1
commit c8148f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/scripts/deploy_roles.ts b/scripts/deploy_roles.ts
@@ -7,7 +7,7 @@ async function main() {
   // Order of contracts and how should they be deployed, testnet addresses
   const currentPostage = '0xF5147D56502C80004f91FB4112d6812CddE8eDE3';
   const currentOracle = '0xd41A47fCaa67945A11a398F00D5f7F130aF03733';
-  const currentStaking = '0xCb07bf0603da228C8ec602bf12b973b8A94f9bac'; // old staking
+  const currentStaking = '0xB05D6304a6A4f940917Ff908325d6560409543dF';
   const currentRedis = '0x264079eeF0CE42D790e3FA7DF8D0cfA675ef6504';
 
   // Change roles on current stamp contract

diff --git a/scripts/deploy_staking.ts b/scripts/deploy_staking.ts
@@ -82,15 +82,21 @@ async function main() {
   let args: string[] = [];
   let waitTime = 6;
   let currentRedis = '';
+  let swarmNetworkID = '1';
   if (network.name == 'mainnet') {
+    swarmNetworkID = '1';
     // BZZ token, SwarmNetworkId, Multisig
-    args = ['0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe', '1', '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe'];
+    args = ['0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe', swarmNetworkID, '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe'];
     currentRedis = '';
   } else if (network.name == 'testnet') {
-    args = ['0x0b2bbcbe94d5d4bb782713b137c85d29aa609a13', '10', '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe'];
-    currentRedis = '0x9e3BDb0c69838CC06D85409d4AD6245e54F70F1d';
+    swarmNetworkID = '333';
+    //args = ['0x0b2bbcbe94d5d4bb782713b137c85d29aa609a13', swarmNetworkID, '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe'];
+    // Old gBZZ
+    args = ['0x2ac3c1d3e24b45c6c310534bc2dd84b5ed576335', swarmNetworkID, '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe'];
+    currentRedis = '0x264079eeF0CE42D790e3FA7DF8D0cfA675ef6504';
   } else if (network.name == 'localhost') {
-    args = ['0x942C6684eB9874C63d4ed26Ab0623F951D253081', '0', '0x3c8F39EE625fCF97cB6ee22bCe25BE1F1E5A5dE8'];
+    swarmNetworkID = '0';
+    args = ['0x942C6684eB9874C63d4ed26Ab0623F951D253081', swarmNetworkID, '0x3c8F39EE625fCF97cB6ee22bCe25BE1F1E5A5dE8'];
     waitTime = 1;
     currentRedis = '0xDF64aed195102E644ad6A0204eD5377589b29618';
   }

diff --git a/testnet_deployed.json b/testnet_deployed.json
@@ -1,6 +1,6 @@
 {
 	"chainId": 5,
-	"swarmNetworkId": 10,
+	"swarmNetworkId": 333,
 	"contracts": {
 		"bzzToken": {
 			"abi": [
@@ -1263,9 +1263,9 @@
 				}
 			],
 			"bytecode": "0x60806040523480156200001157600080fd5b506040516200191d3803806200191d833981016040819052620000349162000180565b6001805460ff19169055600380546001600160a01b03851668010000000000000000026001600160e01b03199091166001600160401b038516171790556200007e600082620000b3565b620000aa7f65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a33620000b3565b505050620001d8565b620000bf8282620000c3565b5050565b6000828152602081815260408083206001600160a01b038516845290915290205460ff16620000bf576000828152602081815260408083206001600160a01b03851684529091529020805460ff191660011790556200011f3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b80516001600160a01b03811681146200017b57600080fd5b919050565b6000806000606084860312156200019657600080fd5b620001a18462000163565b60208501519093506001600160401b0381168114620001bf57600080fd5b9150620001cf6040850162000163565b90509250925092565b61173580620001e86000396000f3fe608060405234801561001057600080fd5b50600436106101825760003560e01c806391d14854116100d8578063abe385431161008c578063e63ab1e911610066578063e63ab1e9146103fc578063ede4130214610423578063f7b188a51461044657600080fd5b8063abe38543146103c3578063d547741f146103d6578063e34c4527146103e957600080fd5b8063a217fddf116100bd578063a217fddf14610381578063a6471a1d14610389578063a6ce31d4146103b057600080fd5b806391d148541461031d578063a0d22b211461035457600080fd5b8063420fc4db1161013a578063837fd16a11610114578063837fd16a146102805780638456cb59146102935780638fee64071461029b57600080fd5b8063420fc4db1461021b57806348962b93146102525780635c975abb1461027557600080fd5b8063248a9ca31161016b578063248a9ca3146101c45780632f2ff15d146101f557806336568abe1461020857600080fd5b806301ffc9a7146101875780631ed2cd40146101af575b600080fd5b61019a610195366004611477565b61044e565b60405190151581526020015b60405180910390f35b6101c26101bd3660046114d5565b6104e7565b005b6101e76101d2366004611508565b60009081526020819052604090206001015490565b6040519081526020016101a6565b6101c2610203366004611521565b61088b565b6101c2610216366004611521565b6108b5565b60035461023a906801000000000000000090046001600160a01b031681565b6040516001600160a01b0390911681526020016101a6565b6101e7610260366004611508565b60009081526002602052604090206001015490565b60015460ff1661019a565b6101c261028e36600461154d565b610941565b6101c2610a58565b6102e56102a9366004611508565b6002602081905260009182526040909120805460018201549282015460038301546004909301549193926001600160a01b039091169160ff1685565b6040805195865260208601949094526001600160a01b039092169284019290925260608301919091521515608082015260a0016101a6565b61019a61032b366004611521565b6000918252602082815260408084206001600160a01b0393909316845291905290205460ff1690565b61023a610362366004611508565b600090815260026020819052604090912001546001600160a01b031690565b6101e7600081565b6101e77f3e35b14a9f4fef84b59f9bdcd3044fc28783144b7e42bfb2cd075e6a02cb082881565b6101c26103be36600461154d565b610ae0565b6101e76103d1366004611508565b610c7c565b6101c26103e4366004611521565b610cb1565b6101c26103f736600461154d565b610cd6565b6101e77f65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a81565b6101e7610431366004611508565b60009081526002602052604090206003015490565b6101c2610f28565b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f7965db0b0000000000000000000000000000000000000000000000000000000014806104e157507f01ffc9a7000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316145b92915050565b6104ef610fae565b6001600160a01b038316331461054c5760405162461bcd60e51b815260206004820152601b60248201527f6f6e6c79206f776e65722063616e20757064617465207374616b65000000000060448201526064015b60405180910390fd5b600354600090849065ff000000ff00600882811b91821664ff000000ff9390911c92831617601090811b67ff000000ff0000009290921666ff000000ff0000939093169290921790911c17602081811b6bffffffffffffffff000000001691901c63ffffffff161760405160609290921b6bffffffffffffffffffffffff1916602083015260c01b7fffffffffffffffff000000000000000000000000000000000000000000000000166034820152603c8101849052605c0160408051601f19818403018152918152815160209283012060008181526002909352912060040154909150829060ff16156106b957600082815260026020526040902060030154431161069a5760405162461bcd60e51b815260206004820152601860248201527f6f7665726c61792063757272656e746c792066726f7a656e00000000000000006044820152606401610543565b6000828152600260205260409020600101546106b69084611585565b90505b6003546040517f23b872dd00000000000000000000000000000000000000000000000000000000815233600482015230602482015260448101859052680100000000000000009091046001600160a01b0316906323b872dd906064016020604051808303816000875af1158015610734573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107589190611598565b6107a45760405162461bcd60e51b815260206004820152600f60248201527f6661696c6564207472616e7366657200000000000000000000000000000000006044820152606401610543565b604080518281526001600160a01b03871660208201524381830152905183917f61e979698346a2aa868a3a9f08d30c846174841dc9b074bbf2a82d20554bc682919081900360600190a26040805160a08101825283815260208082019384526001600160a01b039788168284019081524360608401908152600160808501818152600098895260029485905295909720935184559451958301959095559351938101805473ffffffffffffffffffffffffffffffffffffffff1916949097169390931790955551600382015592516004909301805460ff1916931515939093179092555050565b6000828152602081905260409020600101546108a681611001565b6108b0838361100e565b505050565b6001600160a01b03811633146109335760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201527f20726f6c657320666f722073656c6600000000000000000000000000000000006064820152608401610543565b61093d82826110ac565b5050565b3360009081527f10fa80d2e578284bf61a483a3da84fbdd683a7e7256a9895dc4461ac543f4a16602052604090205460ff166109e55760405162461bcd60e51b815260206004820152602360248201527f6f6e6c792072656469737472696275746f722063616e20667265657a6520737460448201527f616b6500000000000000000000000000000000000000000000000000000000006064820152608401610543565b60008281526002602052604090206004015460ff161561093d5760408051838152602081018390527f340439a63c1ee2404f5b7010cab559b4dcbfc28b8baab9acade354fd688ae2b9910160405180910390a1610a428143611585565b6000838152600260205260409020600301555050565b3360009081527ff7c9542c591017a21c74b6f3fab6263c7952fc0aaf9db4c22a2a04ddc7f8674f602052604090205460ff16610ad65760405162461bcd60e51b815260206004820152601560248201527f6f6e6c79207061757365722063616e20706175736500000000000000000000006044820152606401610543565b610ade61112b565b565b3360009081527f10fa80d2e578284bf61a483a3da84fbdd683a7e7256a9895dc4461ac543f4a16602052604090205460ff16610b845760405162461bcd60e51b815260206004820152602260248201527f6f6e6c792072656469737472696275746f722063616e20736c6173682073746160448201527f6b650000000000000000000000000000000000000000000000000000000000006064820152608401610543565b60408051838152602081018390527f0956b50d4d586f6b9c90800d4e713bd2b866e044decd047e6d70ea20314ab308910160405180910390a160008281526002602052604090206004015460ff161561093d57600082815260026020526040902060010154811015610c2e5760008281526002602052604081206001018054839290610c119084906115ba565b909155505050600090815260026020526040902043600390910155565b506000908152600260208190526040822082815560018101839055908101805473ffffffffffffffffffffffffffffffffffffffff191690556003810191909155600401805460ff19169055565b6000818152600260205260408120600301544311610c9b5760006104e1565b5060009081526002602052604090206001015490565b600082815260208190526040902060010154610ccc81611001565b6108b083836110ac565b610cde61117f565b600082815260026020819052604090912001546001600160a01b03163314610d485760405162461bcd60e51b815260206004820152601d60248201527f6f6e6c79206f776e65722063616e207769746864726177207374616b650000006044820152606401610543565b6000828152600260205260409020600101548190811115610d7757506000828152600260205260409020600101545b600083815260026020526040902060010154811015610e975760008381526002602052604081206001018054839290610db19084906115ba565b9091555050600083815260026020526040908190204360039182015554905163a9059cbb60e01b815233600482015260248101839052680100000000000000009091046001600160a01b03169063a9059cbb906044015b6020604051808303816000875af1158015610e27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4b9190611598565b6108b05760405162461bcd60e51b815260206004820152601160248201527f6661696c6564207769746864726177616c0000000000000000000000000000006044820152606401610543565b600083815260026020819052604080832083815560018101849055918201805473ffffffffffffffffffffffffffffffffffffffff191690556003808301939093556004918201805460ff191690559154915163a9059cbb60e01b8152339181019190915260248101839052680100000000000000009091046001600160a01b03169063a9059cbb90604401610e08565b3360009081527ff7c9542c591017a21c74b6f3fab6263c7952fc0aaf9db4c22a2a04ddc7f8674f602052604090205460ff16610fa65760405162461bcd60e51b815260206004820152601760248201527f6f6e6c79207061757365722063616e20756e70617573650000000000000000006044820152606401610543565b610ade6111d1565b60015460ff1615610ade5760405162461bcd60e51b815260206004820152601060248201527f5061757361626c653a20706175736564000000000000000000000000000000006044820152606401610543565b61100b813361120a565b50565b6000828152602081815260408083206001600160a01b038516845290915290205460ff1661093d576000828152602081815260408083206001600160a01b03851684529091529020805460ff191660011790556110683390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000828152602081815260408083206001600160a01b038516845290915290205460ff161561093d576000828152602081815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b611133610fae565b6001805460ff1916811790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258335b6040516001600160a01b03909116815260200160405180910390a1565b60015460ff16610ade5760405162461bcd60e51b815260206004820152601460248201527f5061757361626c653a206e6f74207061757365640000000000000000000000006044820152606401610543565b6111d961117f565b6001805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa33611162565b6000828152602081815260408083206001600160a01b038516845290915290205460ff1661093d5761123b8161127d565b61124683602061128f565b6040516020016112579291906115f1565b60408051601f198184030181529082905262461bcd60e51b825261054391600401611672565b60606104e16001600160a01b03831660145b6060600061129e8360026116a5565b6112a9906002611585565b67ffffffffffffffff8111156112c1576112c16116bc565b6040519080825280601f01601f1916602001820160405280156112eb576020820181803683370190505b5090507f300000000000000000000000000000000000000000000000000000000000000081600081518110611322576113226116d2565b60200101906001600160f81b031916908160001a9053507f78000000000000000000000000000000000000000000000000000000000000008160018151811061136d5761136d6116d2565b60200101906001600160f81b031916908160001a90535060006113918460026116a5565b61139c906001611585565b90505b6001811115611421577f303132333435363738396162636465660000000000000000000000000000000085600f16601081106113dd576113dd6116d2565b1a60f81b8282815181106113f3576113f36116d2565b60200101906001600160f81b031916908160001a90535060049490941c9361141a816116e8565b905061139f565b5083156114705760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610543565b9392505050565b60006020828403121561148957600080fd5b81357fffffffff000000000000000000000000000000000000000000000000000000008116811461147057600080fd5b80356001600160a01b03811681146114d057600080fd5b919050565b6000806000606084860312156114ea57600080fd5b6114f3846114b9565b95602085013595506040909401359392505050565b60006020828403121561151a57600080fd5b5035919050565b6000806040838503121561153457600080fd5b82359150611544602084016114b9565b90509250929050565b6000806040838503121561156057600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b808201808211156104e1576104e161156f565b6000602082840312156115aa57600080fd5b8151801515811461147057600080fd5b818103818111156104e1576104e161156f565b60005b838110156115e85781810151838201526020016115d0565b50506000910152565b7f416363657373436f6e74726f6c3a206163636f756e74200000000000000000008152600083516116298160178501602088016115cd565b7f206973206d697373696e6720726f6c652000000000000000000000000000000060179184019182015283516116668160288401602088016115cd565b01602801949350505050565b60208152600082518060208401526116918160408501602087016115cd565b601f01601f19169190910160400192915050565b80820281158282048414176104e1576104e161156f565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6000816116f7576116f761156f565b50600019019056fea2646970667358221220f0b4144c19d5cae2a8320d2f02e01f15781028feac7155ffd9a95e43b9048f4564736f6c63430008130033",
-			"address": "0xEEb49D760B58b035b18738069E8CD0ccf152Fb39",
-			"block": 9778341,
-			"url": "https://goerli.etherscan.io/address/0xEEb49D760B58b035b18738069E8CD0ccf152Fb39"
+			"address": "0xB05D6304a6A4f940917Ff908325d6560409543dF",
+			"block": 9813730,
+			"url": "https://goerli.etherscan.io/address/0xB05D6304a6A4f940917Ff908325d6560409543dF"
 		},
 		"postageStamp": {
 			"abi": [