Merge pull request #24 from vmware-samples/lup/VB-846

VB-846 Contracts are being removed or being added to a version

supply-chain/verify/README.md

@@ -32,5 +32,5 @@ npm run verify_contracts:vmware
 Or deploy and verify the contracts at the same time
 
 ```shell
-npm run verify_and_deploy:vmware
+npm run deploy_and_verify:vmware
 ```

supply-chain/verify/flatten.sh

@@ -1 +1,7 @@
 # !/bin/bash
+if [ ! -d truffle-flattener  ];then
+  mkdir truffle-flattener
+fi
+
+truffle-flattener contracts/OrdersV1.sol > truffle-flattener/OrdersV1Flattened.sol
+truffle-flattener contracts/OrdersProxy.sol > truffle-flattener/OrdersProxyFlattened.sol

supply-chain/verify/verify.js

@@ -6,6 +6,7 @@
 
 const fs = require("fs");
 const https = require("https");
+const timestamp = new Date().getTime();
 
 verifyMigrations();
 verifyOrdersV1();
@@ -46,7 +47,7 @@ function verifyMigrations() {
   const address = jsonContent.networks[5000].address;
 
   const data = JSON.stringify({
-    "contract_id": "Migrations",
+    "contract_id": `Migrations-${timestamp}`,
     "compiler_version": "v0.4.25+commit.59dbf8f1",
     "sourcecode": sourcecode,
     "contract_name": "Migrations",
@@ -65,7 +66,7 @@ function verifyOrdersV1() {
   const address = jsonContent.networks[5000].address;
 
   const data = JSON.stringify({
-    "contract_id": "OrdersV1",
+    "contract_id": `OrdersV1-${timestamp}`,
     "compiler_version": "v0.4.25+commit.59dbf8f1",
     "sourcecode": sourcecode,
     "contract_name": "OrdersV1",
@@ -84,7 +85,7 @@ function verifyOrdersProxy() {
   const address = jsonContent.networks[5000].address;
 
   const data = JSON.stringify({
-    "contract_id": "OrdersProxy",
+    "contract_id": `OrdersProxy-${timestamp}`,
     "compiler_version": "v0.4.25+commit.59dbf8f1",
     "sourcecode": sourcecode,
     "contract_name": "OrdersProxy",