Merge pull request #106 from unification-com/shibarium

Add support for Shibarium

Makefile

@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 abigen:
-	npx truffle run abigen
-	abigen --abi smart-contracrts/abigenBindings/abi/Router.abi --pkg ooo_router --out go-ooo/ooo_router/ooo_router.go
+	cd smart-contracts && npx truffle run abigen
+	abigen --abi smart-contracts/abigenBindings/abi/Router.abi --pkg ooo_router --out go-ooo/ooo_router/ooo_router.go
 
 # Dev environment
 dev-env:

docker/assets/request-data.js

@@ -60,7 +60,7 @@ module.exports = async function (callback) {
     console.log("requesting", data)
     receipt = await demoConsumer.requestData(endpoint, pair, { from: consumerOwner })
     console.log("tx hash", receipt.tx)
-    const requestId = receipt.receipt.rawLogs[2].topics[3]
+    const requestId = receipt.receipt.rawLogs[1].topics[3]
     console.log("requestId", requestId)
 
     console.log("waiting for fulfilment. This may take 3 - 4 blocks.")

go-ooo/cmd/root.go

@@ -13,13 +13,7 @@ var keystorePass string
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "app",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Short: "OoO Provider Application",
 	PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 		return server.InterceptConfigsPreRunHandler(cmd)
 	},

go-ooo/config/config.go

@@ -145,6 +145,9 @@ func (c *Config) InitForNet(network string) {
 	case "dev":
 		c.InitForDevNet()
 		break
+	case "shibarium":
+		c.InitForShibarium()
+		break
 	default:
 		c.InitForDevNet()
 		break
@@ -192,6 +195,14 @@ func (c *Config) InitForPolygon() {
 	c.Chain.FirstBlock = 24460663
 }
 
+func (c *Config) InitForShibarium() {
+	c.Chain.ContractAddress = "0x2E9ade949900e19735689686E61BF6338a65B881"
+	c.Chain.EthHttpHost = ""
+	c.Chain.EthWsHost = ""
+	c.Chain.NetworkId = 109
+	c.Chain.FirstBlock = 591096
+}
+
 func (c *Config) SetKeystore(path, account string) {
 	c.Keystore.File = path
 	c.Keystore.Account = account