From 3ad73443c7a96c928577234df5c742d53f3293ef Mon Sep 17 00:00:00 2001
From: weimumu <934657014@qq.com>
Date: Mon, 17 Dec 2018 16:50:52 +0800
Subject: [PATCH] fix slice unpack bug in accounts/abi (#18321)

* fix slice unpack bug in accounts/abi
---
 accounts/abi/unpack.go      | 2 +-
 accounts/abi/unpack_test.go | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go
index d5875140c..c3bbbb251 100644
--- a/accounts/abi/unpack.go
+++ b/accounts/abi/unpack.go
@@ -151,7 +151,7 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
 	// Arrays have packed elements, resulting in longer unpack steps.
 	// Slices have just 32 bytes per element (pointing to the contents).
 	elemSize := 32
-	if t.T == ArrayTy {
+	if t.T == ArrayTy || t.T == SliceTy {
 		elemSize = getFullElemSize(t.Elem)
 	}
 
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
index 97552b90c..29ed4522c 100644
--- a/accounts/abi/unpack_test.go
+++ b/accounts/abi/unpack_test.go
@@ -191,6 +191,11 @@ var unpackTests = []unpackTest{
 		enc:  "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		want: [][2]uint8{{1, 2}},
 	},
+	{
+		def:  `[{"type": "uint8[2][]"}]`,
+		enc:  "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		want: [][2]uint8{{1, 2}, {1, 2}},
+	},
 	{
 		def:  `[{"type": "uint16[]"}]`,
 		enc:  "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",